Rename vars and functions from 'glslcaps'->'shadercaps'

Change-Id: I34d226d866dd4ba8e5f33f95cb8cbf01292f9314
Reviewed-on: https://skia-review.googlesource.com/5312
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

1 files changed, 14 insertions, 14 deletions

diff --git a/src/gpu/GrProgramDesc.cpp b/src/gpu/GrProgramDesc.cpp
index 0390df01c0..c6a1bcfc0d 100644
--- a/src/gpu/GrProgramDesc.cpp
+++ b/src/gpu/GrProgramDesc.cpp
@@ -110,7 +110,7 @@ static void add_sampler_and_image_keys(GrProcessorKeyBuilder* b, const GrProcess
  * function because it is hairy, though FPs do not have attribs, and GPs do not have transforms
  */
 static bool gen_meta_key(const GrProcessor& proc,
-                         const GrShaderCaps& glslCaps,
+                         const GrShaderCaps& shaderCaps,
                          uint32_t transformKey,
                          GrProcessorKeyBuilder* b) {
     size_t processorKeySize = b->size();
@@ -122,7 +122,7 @@ static bool gen_meta_key(const GrProcessor& proc,
         return false;
     }
 
-    add_sampler_and_image_keys(b, proc, glslCaps);
+    add_sampler_and_image_keys(b, proc, shaderCaps);
 
     uint32_t* key = b->add32n(2);
     key[0] = (classID << 16) | SkToU32(processorKeySize);
@@ -132,25 +132,25 @@ static bool gen_meta_key(const GrProcessor& proc,
 
 static bool gen_frag_proc_and_meta_keys(const GrPrimitiveProcessor& primProc,
                                         const GrFragmentProcessor& fp,
-                                        const GrShaderCaps& glslCaps,
+                                        const GrShaderCaps& shaderCaps,
                                         GrProcessorKeyBuilder* b) {
     for (int i = 0; i < fp.numChildProcessors(); ++i) {
-        if (!gen_frag_proc_and_meta_keys(primProc, fp.childProcessor(i), glslCaps, b)) {
+        if (!gen_frag_proc_and_meta_keys(primProc, fp.childProcessor(i), shaderCaps, b)) {
             return false;
         }
     }
 
-    fp.getGLSLProcessorKey(glslCaps, b);
+    fp.getGLSLProcessorKey(shaderCaps, b);
 
-    return gen_meta_key(fp, glslCaps, primProc.getTransformKey(fp.coordTransforms(),
-                                                               fp.numCoordTransforms()), b);
+    return gen_meta_key(fp, shaderCaps, primProc.getTransformKey(fp.coordTransforms(),
+                                                                 fp.numCoordTransforms()), b);
 }
 
 bool GrProgramDesc::Build(GrProgramDesc* desc,
                           const GrPrimitiveProcessor& primProc,
                           bool hasPointSize,
                           const GrPipeline& pipeline,
-                          const GrShaderCaps& glslCaps) {
+                          const GrShaderCaps& shaderCaps) {
     // The descriptor is used as a cache key. Thus when a field of the
     // descriptor will not affect program generation (because of the attribute
     // bindings in use or other descriptor field settings) it should be set
@@ -163,8 +163,8 @@ bool GrProgramDesc::Build(GrProgramDesc* desc,
 
     GrProcessorKeyBuilder b(&desc->key());
 
-    primProc.getGLSLProcessorKey(glslCaps, &b);
-    if (!gen_meta_key(primProc, glslCaps, 0, &b)) {
+    primProc.getGLSLProcessorKey(shaderCaps, &b);
+    if (!gen_meta_key(primProc, shaderCaps, 0, &b)) {
         desc->key().reset();
         return false;
     }
@@ -172,7 +172,7 @@ bool GrProgramDesc::Build(GrProgramDesc* desc,
 
     for (int i = 0; i < pipeline.numFragmentProcessors(); ++i) {
         const GrFragmentProcessor& fp = pipeline.getFragmentProcessor(i);
-        if (!gen_frag_proc_and_meta_keys(primProc, fp, glslCaps, &b)) {
+        if (!gen_frag_proc_and_meta_keys(primProc, fp, shaderCaps, &b)) {
             desc->key().reset();
             return false;
         }
@@ -180,8 +180,8 @@ bool GrProgramDesc::Build(GrProgramDesc* desc,
     }
 
     const GrXferProcessor& xp = pipeline.getXferProcessor();
-    xp.getGLSLProcessorKey(glslCaps, &b);
-    if (!gen_meta_key(xp, glslCaps, 0, &b)) {
+    xp.getGLSLProcessorKey(shaderCaps, &b);
+    if (!gen_meta_key(xp, shaderCaps, 0, &b)) {
         desc->key().reset();
         return false;
     }
@@ -212,7 +212,7 @@ bool GrProgramDesc::Build(GrProgramDesc* desc,
         header->fSamplePatternKey = 0;
     }
 
-    header->fOutputSwizzle = glslCaps.configOutputSwizzle(rt->config()).asKey();
+    header->fOutputSwizzle = shaderCaps.configOutputSwizzle(rt->config()).asKey();
 
     header->fIgnoresCoverage = pipeline.ignoresCoverage() ? 1 : 0;