Create swizzle table inside of glsl caps

src/gpu/gl/builders/GrGLShaderBuilder.cpp

Index: src/gpu/gl/builders/GrGLShaderBuilder.cpp
diff --git a/src/gpu/gl/builders/GrGLShaderBuilder.cpp b/src/gpu/gl/builders/GrGLShaderBuilder.cpp
index 03dc1667c76fe81e04d4814ac8e6832f46023461..737de343007483c9cd21a561739a67c3b12cc7f1 100644
--- a/src/gpu/gl/builders/GrGLShaderBuilder.cpp
+++ b/src/gpu/gl/builders/GrGLShaderBuilder.cpp
@@ -6,41 +6,64 @@
  */
 
 #include "GrGLShaderBuilder.h"
-#include "gl/GrGLGpu.h"
 #include "gl/builders/GrGLProgramBuilder.h"
 #include "glsl/GrGLSLCaps.h"
 #include "glsl/GrGLSLShaderVar.h"
 #include "glsl/GrGLSLTextureSampler.h"
 
 namespace {
+void map_swizzle(const char* swizzleMap, const char* swizzle, char* mangledSwizzle) {

[bsalomon, 2015/11/03 14:45:51]

let's unnamespace and static these funcs to bring it in line with other code.

[egdaniel, 2015/11/03 15:23:56]

Done.

+    int i;
+    for (i = 0; '\0' != swizzle[i]; ++i) {
+        switch (swizzle[i]) {
+            case 'r':
+                mangledSwizzle[i] = swizzleMap[0];
+                break;
+            case 'g':
+                mangledSwizzle[i] = swizzleMap[1];
+                break;
+            case 'b':
+                mangledSwizzle[i] = swizzleMap[2];
+                break;
+            case 'a':
+                mangledSwizzle[i] = swizzleMap[3];
+                break;
+            default:
+                SkFAIL("Unsupported swizzle");
+        }
+    }
+    mangledSwizzle[i] ='\0';
+}
+
 void append_texture_lookup(SkString* out,
-                           GrGLGpu* gpu,
+                           const GrGLSLCaps* glslCaps,
                            const char* samplerName,
                            const char* coordName,
-                           uint32_t configComponentMask,
+                           GrPixelConfig config,
                            const char* swizzle,
                            GrSLType varyingType = kVec2f_GrSLType) {
     SkASSERT(coordName);
 
     out->appendf("%s(%s, %s)",
-                 GrGLSLTexture2DFunctionName(varyingType, gpu->glslGeneration()),
+                 GrGLSLTexture2DFunctionName(varyingType, glslCaps->generation()),
                  samplerName,
                  coordName);
 
     char mangledSwizzle[5];
 
-    // The swizzling occurs using texture params instead of shader-mangling if ARB_texture_swizzle
-    // is available.
-    if (!gpu->glCaps().textureSwizzleSupport() &&
-        (kA_GrColorComponentFlag == configComponentMask)) {
-        char alphaChar = gpu->glCaps().textureRedSupport() ? 'r' : 'a';
-        int i;
-        for (i = 0; '\0' != swizzle[i]; ++i) {
-            mangledSwizzle[i] = alphaChar;
+    // This refers to any swizzling we may need to get from some backend internal format to the
+    // format used in GrPixelConfig. Some backends will automatically do the sizzling for us.
+    if (glslCaps->mustSwizzleInShader()) {
+        const char* swizzleMap = glslCaps->getSwizzleMap(config);
+        // if the map is simply 'rgba' then we don't need to do any manual swizzling to get us to
+        // a GrPixelConfig format.
+        if (memcmp(swizzleMap, "rgba", 4)) {
+            // Manually 'swizzle' the swizzle using our mapping
+            map_swizzle(swizzleMap, swizzle, mangledSwizzle);
+            swizzle = mangledSwizzle;
         }
-        mangledSwizzle[i] ='\0';
-        swizzle = mangledSwizzle;
     }
+
     // For shader prettiness we omit the swizzle rather than appending ".rgba".
     if (memcmp(swizzle, "rgba", 4)) {
         out->appendf(".%s", swizzle);
@@ -97,10 +120,10 @@ void GrGLShaderBuilder::appendTextureLookup(SkString* out,
                                             const char* coordName,
                                             GrSLType varyingType) const {
     append_texture_lookup(out,
-                          fProgramBuilder->gpu(),
+                          fProgramBuilder->glslCaps(),
                           fProgramBuilder->getUniformCStr(sampler.fSamplerUniform),
                           coordName,
-                          sampler.configComponentMask(),
+                          sampler.config(),
                           sampler.swizzle(),
                           varyingType);
 }
@@ -134,19 +157,6 @@ void GrGLShaderBuilder::appendDecls(const VarArray& vars, SkString* out) const {
     }
 }
 
-void GrGLShaderBuilder::appendTextureLookup(const char* samplerName,
-                                            const char* coordName,
-                                            uint32_t configComponentMask,
-                                            const char* swizzle) {
-    append_texture_lookup(&this->code(),
-                          fProgramBuilder->gpu(),
-                          samplerName,
-                          coordName,
-                          configComponentMask,
-                          swizzle,
-                          kVec2f_GrSLType);
-}
-
 void GrGLShaderBuilder::addLayoutQualifier(const char* param, InterfaceQualifier interface) {
     SkASSERT(fProgramBuilder->glslCaps()->generation() >= k330_GrGLSLGeneration ||
              fProgramBuilder->glslCaps()->mustEnableAdvBlendEqs());