commit d3feb6fef7f8f88a964e2f1cd6412089d5e7bdad
author John Stiles <johnstiles@google.com> Thu Jul 23 18:18:12 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jul 24 15:08:29 2020 +0000
tree b330138d4c2eca842168eae79bc08183d1018b6a
parent c8bc99ff6a8a1bc23d836faa95a718f0a0ddb249

Simplify GrPipeline by removing unused functionality.

Change-Id: Ibdd662fac5b3dedd1f231a9ba32c6e35e8fdf4da
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305545
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>

src/gpu/GrProgramDesc.cpp

diff --git a/src/gpu/GrProgramDesc.cpp b/src/gpu/GrProgramDesc.cpp
index 694473d..d32eaf7 100644
--- a/src/gpu/GrProgramDesc.cpp
+++ b/src/gpu/GrProgramDesc.cpp
@@ -184,26 +184,34 @@
 
     GrProcessorKeyBuilder b(&desc->key());
 
-    programInfo.primProc().getGLSLProcessorKey(*caps.shaderCaps(), &b);
-    programInfo.primProc().getAttributeKey(&b);
-    if (!gen_pp_meta_key(programInfo.primProc(), caps, 0, &b)) {
+    const GrPrimitiveProcessor& primitiveProcessor = programInfo.primProc();
+    primitiveProcessor.getGLSLProcessorKey(*caps.shaderCaps(), &b);
+    primitiveProcessor.getAttributeKey(&b);
+    if (!gen_pp_meta_key(primitiveProcessor, caps, 0, &b)) {
         desc->key().reset();
         return false;
     }
 
-    for (int i = 0; i < programInfo.pipeline().numFragmentProcessors(); ++i) {
-        const GrFragmentProcessor& fp = programInfo.pipeline().getFragmentProcessor(i);
-        if (!gen_frag_proc_and_meta_keys(programInfo.primProc(), fp, caps, &b)) {
+    const GrPipeline& pipeline = programInfo.pipeline();
+    int numColorFPs = 0, numCoverageFPs = 0;
+    for (int i = 0; i < pipeline.numFragmentProcessors(); ++i) {
+        const GrFragmentProcessor& fp = pipeline.getFragmentProcessor(i);
+        if (!gen_frag_proc_and_meta_keys(primitiveProcessor, fp, caps, &b)) {
             desc->key().reset();
             return false;
         }
+        if (pipeline.isColorFragmentProcessor(i)) {
+            ++numColorFPs;
+        } else if (pipeline.isCoverageFragmentProcessor(i)) {
+            ++numCoverageFPs;
+        }
     }
 
-    const GrXferProcessor& xp = programInfo.pipeline().getXferProcessor();
+    const GrXferProcessor& xp = pipeline.getXferProcessor();
     const GrSurfaceOrigin* originIfDstTexture = nullptr;
     GrSurfaceOrigin origin;
-    if (programInfo.pipeline().dstProxyView().proxy()) {
-        origin = programInfo.pipeline().dstProxyView().origin();
+    if (pipeline.dstProxyView().proxy()) {
+        origin = pipeline.dstProxyView().origin();
         originIfDstTexture = &origin;
     }
     xp.getGLSLProcessorKey(*caps.shaderCaps(), &b, originIfDstTexture);
@@ -213,7 +221,7 @@
     }
 
     if (programInfo.requestedFeatures() & GrProcessor::CustomFeatures::kSampleLocations) {
-        SkASSERT(programInfo.pipeline().isHWAntialiasState());
+        SkASSERT(pipeline.isHWAntialiasState());
         b.add32(renderTarget->renderTargetPriv().getSamplePatternKey());
     }
 
@@ -224,16 +232,11 @@
 
     // make sure any padding in the header is zeroed.
     memset(header, 0, kHeaderSize);
-    header->fWriteSwizzle = programInfo.pipeline().writeSwizzle().asKey();
-    header->fColorFragmentProcessorCnt = programInfo.pipeline().numColorFragmentProcessors();
-    header->fCoverageFragmentProcessorCnt = programInfo.pipeline().numCoverageFragmentProcessors();
-    // Fail if the client requested more processors than the key can fit.
-    if (header->fColorFragmentProcessorCnt != programInfo.pipeline().numColorFragmentProcessors() ||
-        header->fCoverageFragmentProcessorCnt !=
-                                         programInfo.pipeline().numCoverageFragmentProcessors()) {
-        desc->key().reset();
-        return false;
-    }
+    header->fWriteSwizzle = pipeline.writeSwizzle().asKey();
+    header->fColorFragmentProcessorCnt = numColorFPs;
+    header->fCoverageFragmentProcessorCnt = numCoverageFPs;
+    SkASSERT(header->fColorFragmentProcessorCnt == numColorFPs);
+    SkASSERT(header->fCoverageFragmentProcessorCnt == numCoverageFPs);
     // If we knew the shader won't depend on origin, we could skip this (and use the same program
     // for both origins). Instrumenting all fragment processors would be difficult and error prone.
     header->fSurfaceOriginKey =
@@ -241,7 +244,7 @@
     header->fProcessorFeatures = (uint8_t)programInfo.requestedFeatures();
     // Ensure enough bits.
     SkASSERT(header->fProcessorFeatures == (int) programInfo.requestedFeatures());
-    header->fSnapVerticesToPixelCenters = programInfo.pipeline().snapVerticesToPixelCenters();
+    header->fSnapVerticesToPixelCenters = pipeline.snapVerticesToPixelCenters();
     // The base descriptor only stores whether or not the primitiveType is kPoints. Backend-
     // specific versions (e.g., Vulkan) require more detail
     header->fHasPointSize = (programInfo.primitiveType() == GrPrimitiveType::kPoints);