commit f272bea9a6a035d39e9d8ae740bcd39fc236b976
author Robert Phillips <robertphillips@google.com> Thu Oct 17 08:56:16 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Oct 17 18:07:59 2019 +0000
tree eb305b2728f1b9a9d683554ddf6249234d2126ec
parent 8c1cb1c3f2b1ea5af4d8030f24b026fc1a6aff9a

Plumb GrBackendFormat into the GrPrimitiveProcessor::TextureSampler

This is not a substantive CL. It is just setting up for removing the
usage of the GrGpu in the creation of the GrProgramDesc.

Change-Id: Ic24204de256862e5e780626bde3a44f4d735c6e9
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/249121
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/GrProgramDesc.cpp

diff --git a/src/gpu/GrProgramDesc.cpp b/src/gpu/GrProgramDesc.cpp
index 9d42d69..a4a7548 100644
--- a/src/gpu/GrProgramDesc.cpp
+++ b/src/gpu/GrProgramDesc.cpp
@@ -56,8 +56,8 @@
     return SkToU32(samplerTypeKey | swizzleKey << kSamplerOrImageTypeKeyBits);
 }
 
-static void add_sampler_keys(GrProcessorKeyBuilder* b, const GrFragmentProcessor& fp,
-                             GrGpu* gpu, const GrShaderCaps& caps) {
+static void add_fp_sampler_keys(GrProcessorKeyBuilder* b, const GrFragmentProcessor& fp,
+                                GrGpu* gpu, const GrShaderCaps& caps) {
     int numTextureSamplers = fp.numTextureSamplers();
     if (!numTextureSamplers) {
         return;
@@ -81,8 +81,8 @@
     }
 }
 
-static void add_sampler_keys(GrProcessorKeyBuilder* b, const GrPrimitiveProcessor& pp,
-                             const GrShaderCaps& caps) {
+static void add_pp_sampler_keys(GrProcessorKeyBuilder* b, const GrPrimitiveProcessor& pp,
+                                const GrShaderCaps& caps) {
     int numTextureSamplers = pp.numTextureSamplers();
     if (!numTextureSamplers) {
         return;
@@ -113,11 +113,11 @@
  * transforms, etc, for the space allotted in the meta-key.  NOTE, both FPs and GPs share this
  * function because it is hairy, though FPs do not have attribs, and GPs do not have transforms
  */
-static bool gen_meta_key(const GrFragmentProcessor& fp,
-                         GrGpu* gpu,
-                         const GrShaderCaps& shaderCaps,
-                         uint32_t transformKey,
-                         GrProcessorKeyBuilder* b) {
+static bool gen_fp_meta_key(const GrFragmentProcessor& fp,
+                            GrGpu* gpu,
+                            const GrShaderCaps& shaderCaps,
+                            uint32_t transformKey,
+                            GrProcessorKeyBuilder* b) {
     size_t processorKeySize = b->size();
     uint32_t classID = fp.classID();
 
@@ -127,7 +127,7 @@
         return false;
     }
 
-    add_sampler_keys(b, fp, gpu, shaderCaps);
+    add_fp_sampler_keys(b, fp, gpu, shaderCaps);
 
     uint32_t* key = b->add32n(2);
     key[0] = (classID << 16) | SkToU32(processorKeySize);
@@ -135,10 +135,10 @@
     return true;
 }
 
-static bool gen_meta_key(const GrPrimitiveProcessor& pp,
-                         const GrShaderCaps& shaderCaps,
-                         uint32_t transformKey,
-                         GrProcessorKeyBuilder* b) {
+static bool gen_pp_meta_key(const GrPrimitiveProcessor& pp,
+                            const GrShaderCaps& shaderCaps,
+                            uint32_t transformKey,
+                            GrProcessorKeyBuilder* b) {
     size_t processorKeySize = b->size();
     uint32_t classID = pp.classID();
 
@@ -148,7 +148,7 @@
         return false;
     }
 
-    add_sampler_keys(b, pp, shaderCaps);
+    add_pp_sampler_keys(b, pp, shaderCaps);
 
     uint32_t* key = b->add32n(2);
     key[0] = (classID << 16) | SkToU32(processorKeySize);
@@ -156,9 +156,9 @@
     return true;
 }
 
-static bool gen_meta_key(const GrXferProcessor& xp,
-                         const GrShaderCaps& shaderCaps,
-                         GrProcessorKeyBuilder* b) {
+static bool gen_xp_meta_key(const GrXferProcessor& xp,
+                            const GrShaderCaps& shaderCaps,
+                            GrProcessorKeyBuilder* b) {
     size_t processorKeySize = b->size();
     uint32_t classID = xp.classID();
 
@@ -185,8 +185,9 @@
 
     fp.getGLSLProcessorKey(shaderCaps, b);
 
-    return gen_meta_key(fp, gpu, shaderCaps, primProc.getTransformKey(fp.coordTransforms(),
-                                                                      fp.numCoordTransforms()), b);
+    return gen_fp_meta_key(fp, gpu, shaderCaps, primProc.getTransformKey(fp.coordTransforms(),
+                                                                         fp.numCoordTransforms()),
+                                                                         b);
 }
 
 bool GrProgramDesc::Build(GrProgramDesc* desc, const GrRenderTarget* renderTarget,
@@ -208,7 +209,7 @@
 
     programInfo.primProc().getGLSLProcessorKey(shaderCaps, &b);
     programInfo.primProc().getAttributeKey(&b);
-    if (!gen_meta_key(programInfo.primProc(), shaderCaps, 0, &b)) {
+    if (!gen_pp_meta_key(programInfo.primProc(), shaderCaps, 0, &b)) {
         desc->key().reset();
         return false;
     }
@@ -229,7 +230,7 @@
         originIfDstTexture = &origin;
     }
     xp.getGLSLProcessorKey(shaderCaps, &b, originIfDstTexture);
-    if (!gen_meta_key(xp, shaderCaps, &b)) {
+    if (!gen_xp_meta_key(xp, shaderCaps, &b)) {
         desc->key().reset();
         return false;
     }