commit 304e14d88336d34ffec41569a86dc9e79ae9fc3a
author Chris Dalton <csmartdalton@google.com> Tue Mar 17 14:29:06 2020 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Mar 17 23:09:08 2020 +0000
tree 01b81fb4312c93184e46b63690dbb5a5be48187f
parent 1c3bea4593b131004912f3214726e64e514ecd56

Remove FixedDynamicState from GrProgramInfo and GrPipeline

Everybody uses explicit binding now.

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

src/gpu/ops/GrMeshDrawOp.cpp

diff --git a/src/gpu/ops/GrMeshDrawOp.cpp b/src/gpu/ops/GrMeshDrawOp.cpp
index 618e1af..da046e1 100644
--- a/src/gpu/ops/GrMeshDrawOp.cpp
+++ b/src/gpu/ops/GrMeshDrawOp.cpp
@@ -85,8 +85,8 @@
 void GrMeshDrawOp::PatternHelper::recordDraw(
         Target* target,
         const GrGeometryProcessor* gp,
-        const GrPipeline::FixedDynamicState* fixedDynamicState) const {
-    target->recordDraw(gp, fMesh, 1, fixedDynamicState, fPrimitiveType);
+        const GrSurfaceProxy* const primProcProxies[]) const {
+    target->recordDraw(gp, fMesh, 1, primProcProxies, fPrimitiveType);
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -102,26 +102,3 @@
                GrResourceProvider::NumIndicesPerNonAAQuad(), quadsToDraw,
                GrResourceProvider::MaxNumNonAAQuads());
 }
-
-//////////////////////////////////////////////////////////////////////////////
-
-GrPipeline::FixedDynamicState* GrMeshDrawOp::Target::MakeFixedDynamicState(
-        SkArenaAlloc* arena, const GrAppliedClip* clip, int numPrimProcTextures) {
-
-    bool haveScissor = clip && clip->scissorState().enabled();
-
-    if (haveScissor || numPrimProcTextures) {
-        auto result = arena->make<GrPipeline::FixedDynamicState>();
-
-        if (haveScissor) {
-            result->fScissorRect = clip->scissorState().rect();
-        }
-
-        if (numPrimProcTextures) {
-            result->fPrimitiveProcessorTextures = arena->makeArrayDefault<GrSurfaceProxy*>(
-                        numPrimProcTextures);
-        }
-        return result;
-    }
-    return nullptr;
-}