commit 787fd9d80a68fe2ad3d7f6616310319df4aa97ae
author Robert Phillips <robertphillips@google.com> Mon Mar 22 14:48:09 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Mar 22 19:44:40 2021 +0000
tree b9eb5cb778cf8da2854f9b875f8b7ee4503e42a1
parent 583a343d9ade326e9a94508875c6017bbd414ba9

Fuse GrPrimitiveProcessor & GrGeometryProcessor into a new GrGeometryProcessor

With the removal of NVPR we no longer need this distinction.

Bug: skia:11760
Change-Id: I225a4feb764395fb72aca3ffc8b6d05396bf0b1e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/386890
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>

src/gpu/GrProgramDesc.cpp

diff --git a/src/gpu/GrProgramDesc.cpp b/src/gpu/GrProgramDesc.cpp
index 84f4ee1..ebe66ff 100644
--- a/src/gpu/GrProgramDesc.cpp
+++ b/src/gpu/GrProgramDesc.cpp
@@ -9,8 +9,8 @@
 
 #include "include/private/SkChecksum.h"
 #include "include/private/SkTo.h"
+#include "src/gpu/GrGeometryProcessor.h"
 #include "src/gpu/GrPipeline.h"
-#include "src/gpu/GrPrimitiveProcessor.h"
 #include "src/gpu/GrProcessor.h"
 #include "src/gpu/GrProgramInfo.h"
 #include "src/gpu/GrRenderTarget.h"
@@ -53,12 +53,13 @@
     return SkToU32(samplerTypeKey | swizzleKey << kSamplerOrImageTypeKeyBits);
 }
 
-static void add_pp_sampler_keys(GrProcessorKeyBuilder* b, const GrPrimitiveProcessor& pp,
-                                const GrCaps& caps) {
-    int numTextureSamplers = pp.numTextureSamplers();
+static void add_geomproc_sampler_keys(GrProcessorKeyBuilder* b,
+                                      const GrGeometryProcessor& geomProc,
+                                      const GrCaps& caps) {
+    int numTextureSamplers = geomProc.numTextureSamplers();
     b->add32(numTextureSamplers, "ppNumSamplers");
     for (int i = 0; i < numTextureSamplers; ++i) {
-        const GrPrimitiveProcessor::TextureSampler& sampler = pp.textureSampler(i);
+        const GrGeometryProcessor::TextureSampler& sampler = geomProc.textureSampler(i);
         const GrBackendFormat& backendFormat = sampler.backendFormat();
 
         uint32_t samplerKey = sampler_key(backendFormat.textureType(), sampler.swizzle(), caps);
@@ -78,16 +79,16 @@
  * Shader code may be dependent on properties of the effect not placed in the key by the effect
  * (e.g. pixel format of textures used).
  */
-static void gen_pp_key(const GrPrimitiveProcessor& pp,
-                       const GrCaps& caps,
-                       GrProcessorKeyBuilder* b) {
-    b->appendComment(pp.name());
-    b->addBits(kClassIDBits, pp.classID(), "ppClassID");
+static void gen_geomproc_key(const GrGeometryProcessor& geomProc,
+                             const GrCaps& caps,
+                             GrProcessorKeyBuilder* b) {
+    b->appendComment(geomProc.name());
+    b->addBits(kClassIDBits, geomProc.classID(), "geomProcClassID");
 
-    pp.getGLSLProcessorKey(*caps.shaderCaps(), b);
-    pp.getAttributeKey(b);
+    geomProc.getGLSLProcessorKey(*caps.shaderCaps(), b);
+    geomProc.getAttributeKey(b);
 
-    add_pp_sampler_keys(b, pp, caps);
+    add_geomproc_sampler_keys(b, geomProc, caps);
 }
 
 static void gen_xp_key(const GrXferProcessor& xp,
@@ -111,8 +112,8 @@
                        GrProcessorKeyBuilder* b) {
     b->appendComment(fp.name());
     b->addBits(kClassIDBits, fp.classID(), "fpClassID");
-    b->addBits(GrPrimitiveProcessor::kCoordTransformKeyBits,
-               GrPrimitiveProcessor::ComputeCoordTransformsKey(fp), "fpTransforms");
+    b->addBits(GrGeometryProcessor::kCoordTransformKeyBits,
+               GrGeometryProcessor::ComputeCoordTransformsKey(fp), "fpTransforms");
 
     if (auto* te = fp.asTextureEffect()) {
         const GrBackendFormat& backendFormat = te->view().proxy()->backendFormat();
@@ -139,7 +140,7 @@
                     GrRenderTarget* renderTarget,
                     const GrProgramInfo& programInfo,
                     const GrCaps& caps) {
-    gen_pp_key(programInfo.primProc(), caps, b);
+    gen_geomproc_key(programInfo.geomProc(), caps, b);
 
     const GrPipeline& pipeline = programInfo.pipeline();
     b->addBits(2, pipeline.numFragmentProcessors(),      "numFPs");