commit 3bf2f3a9da6ebee19de0085281a409161eee7d74
author Chris Dalton <csmartdalton@google.com> Tue Mar 17 11:48:23 2020 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Mar 17 19:12:18 2020 +0000
tree 56c5a7067896b4f19df127208c27a80bcabcd215
parent dbb833b45702f1c87c622eccbd1830719748379c

Remove DynamicStateArrays from GrProgramInfo and GrPipeline

Every op that updates dynamic state between draws has now been
migrated to explicit binding.

Change-Id: Ibd13c9c0ffb16a205c073dfb4fd21d93f496dc52
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/277493
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

src/gpu/GrProgramInfo.cpp

diff --git a/src/gpu/GrProgramInfo.cpp b/src/gpu/GrProgramInfo.cpp
index a33254e..7fb1053 100644
--- a/src/gpu/GrProgramInfo.cpp
+++ b/src/gpu/GrProgramInfo.cpp
@@ -29,51 +29,12 @@
         SkASSERT(fPipeline->allProxiesInstantiated());
     }
 
-    if (this->hasDynamicPrimProcTextures()) {
-        SkASSERT(!this->hasFixedPrimProcTextures());
+    if (this->hasFixedPrimProcTextures()) {
         SkASSERT(fPrimProc->numTextureSamplers());
-    } else if (this->hasFixedPrimProcTextures()) {
-        SkASSERT(fPrimProc->numTextureSamplers());
-    // TODO: We will soon remove dynamic state from GrProgramInfo. But while migrating to the new
-    // bind/draw API on GrOpsRenderPass, some code will not set the dynamic state because it calls
-    // bindTextures() directly. Once dynamic state (including this validation code) is moved out of
-    // GrProgramInfo, we can restore this assert.
-    // } else {
-    //     SkASSERT(!fPrimProc->numTextureSamplers());
     }
 
-
-    // TODO: We will soon remove dynamic state from GrProgramInfo. But while migrating to the new
-    // bind/draw API on GrOpsRenderPass, some code will not set the dynamic state because it calls
-    // setScissorRect() directly. Once dynamic state (including this validation code) is moved out
-    // of GrProgramInfo, we can restore this assert.
-#if 0
-    SkASSERT((fPipeline->isScissorTestEnabled()) ==
-             (this->hasFixedScissor() || this->hasDynamicScissors()));
-#else
     if (!fPipeline->isScissorTestEnabled()) {
-         SkASSERT(!this->hasFixedScissor() && !this->hasDynamicScissors());
-    }
-#endif
-
-    if (this->hasDynamicPrimProcTextures()) {
-        // Check that, for a given sampler, the properties of the dynamic textures remain
-        // the same for all the meshes
-        for (int s = 0; s < this->primProc().numTextureSamplers(); ++s) {
-            auto dynamicPrimProcTextures = this->dynamicPrimProcTextures(0);
-
-            const GrBackendFormat& format = dynamicPrimProcTextures[s]->backendFormat();
-            GrTextureType type = dynamicPrimProcTextures[s]->backendFormat().textureType();
-
-            for (int m = 1; m < fNumDynamicStateArrays; ++m) {
-                dynamicPrimProcTextures = this->dynamicPrimProcTextures(m);
-
-                auto testProxy = dynamicPrimProcTextures[s];
-                SkASSERT(testProxy->asTextureProxy());
-                SkASSERT(testProxy->backendFormat() == format);
-                SkASSERT(testProxy->backendFormat().textureType() == type);
-            }
-        }
+         SkASSERT(!this->hasFixedScissor());
     }
 }
 
@@ -84,14 +45,8 @@
             SkASSERT(fixedPrimProcTextures[s]->isInstantiated());
         }
     }
-
-    if (this->hasDynamicPrimProcTextures()) {
-        for (int m = 0; m < fNumDynamicStateArrays; ++m) {
-            auto dynamicPrimProcTextures = this->dynamicPrimProcTextures(m);
-            for (int s = 0; s < this->primProc().numTextureSamplers(); ++s) {
-                SkASSERT(dynamicPrimProcTextures[s]->isInstantiated());
-            }
-        }
+    for (auto [sampler, fp] : GrFragmentProcessor::PipelineTextureSamplerRange(this->pipeline())) {
+        SkASSERT(sampler.proxy()->isInstantiated());
     }
 }
 
@@ -109,16 +64,7 @@
         }
     };
 
-    if (this->hasDynamicPrimProcTextures()) {
-        for (int m = 0; m < fNumDynamicStateArrays; ++m) {
-            auto dynamicPrimProcTextures = this->dynamicPrimProcTextures(m);
-
-            for (int s = 0; s < this->primProc().numTextureSamplers(); ++s) {
-                auto* tex = dynamicPrimProcTextures[s]->peekTexture();
-                assertResolved(tex, this->primProc().textureSampler(s).samplerState());
-            }
-        }
-    } else if (this->hasFixedPrimProcTextures()) {
+    if (this->hasFixedPrimProcTextures()) {
         auto fixedPrimProcTextures = this->fixedPrimProcTextures();
 
         for (int s = 0; s < this->primProc().numTextureSamplers(); ++s) {