cc: Add color conversion support to all DrawQuad types

cc/output/shader.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/output/shader.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 42 matching lines @@
                                        int* base_uniform_index) {
   for (size_t i = 0; i < count; i++) {
     locations[i] = (*base_uniform_index)++;
     context->BindUniformLocationCHROMIUM(program, locations[i], uniforms[i]);
   }
 }
 
 static std::string SetFragmentTexCoordPrecision(
     TexCoordPrecision requested_precision,
     std::string shader_string) {
+  std::string prefix;
   switch (requested_precision) {
     case TEX_COORD_PRECISION_HIGH:
       DCHECK_NE(shader_string.find("TexCoordPrecision"), std::string::npos);
-      return "#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-             "  #define TexCoordPrecision highp\n"
-             "#else\n"
-             "  #define TexCoordPrecision mediump\n"
-             "#endif\n" +
-             shader_string;
+      prefix =
+          "#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
+          "  #define TexCoordPrecision highp\n"
+          "#else\n"
+          "  #define TexCoordPrecision mediump\n"
+          "#endif\n";
+      break;
     case TEX_COORD_PRECISION_MEDIUM:
       DCHECK_NE(shader_string.find("TexCoordPrecision"), std::string::npos);
-      return "#define TexCoordPrecision mediump\n" + shader_string;
+      prefix = "#define TexCoordPrecision mediump\n";
+      break;
     case TEX_COORD_PRECISION_NA:
       DCHECK_EQ(shader_string.find("TexCoordPrecision"), std::string::npos);
       DCHECK_EQ(shader_string.find("texture2D"), std::string::npos);
       DCHECK_EQ(shader_string.find("texture2DRect"), std::string::npos);
-      return shader_string;
+      break;
     default:
       NOTREACHED();
       break;
   }
-  return shader_string;
+  std::string lut_prefix = "#define LutLookup texture2D\n";
+  return prefix + lut_prefix + shader_string;
 }
 
 TexCoordPrecision TexCoordPrecisionRequired(GLES2Interface* context,
                                             int* highp_threshold_cache,
                                             int highp_threshold_min,
                                             int x,
                                             int y) {
   if (*highp_threshold_cache == 0) {
     // Initialize range and precision with minimum spec values for when
     // GetShaderPrecisionFormat is a test stub.
@@ skipping 782 matching lines @@
     HDR("uniform sampler2D lut_texture;");
     HDR("uniform float lut_size;");
     HDR("vec4 LUT(sampler2D sampler, vec3 pos, float size) {");
     HDR("  pos *= size - 1.0;");
     HDR("  // Select layer");
     HDR("  float layer = min(floor(pos.z), size - 2.0);");
     HDR("  // Compress the xy coordinates so they stay within");
     HDR("  // [0.5 .. 31.5] / N (assuming a LUT size of 17^3)");
     HDR("  pos.xy = (pos.xy + vec2(0.5)) / size;");
     HDR("  pos.y = (pos.y + layer) / size;");
-    HDR("  return mix(texture2D(sampler, pos.xy),");
-    HDR("             texture2D(sampler, pos.xy + vec2(0, 1.0 / size)),");
+    HDR("  return mix(LutLookup(sampler, pos.xy),");
+    HDR("             LutLookup(sampler, pos.xy + vec2(0, 1.0 / size)),");
     HDR("             pos.z - layer);");
     HDR("}");
     SRC("texColor.xyz = LUT(lut_texture, texColor.xyz, lut_size).xyz;");
   }
 
   // Apply the color matrix to texColor.
   if (has_color_matrix_) {
     HDR("uniform mat4 colorMatrix;");
     HDR("uniform vec4 colorOffset;");
     SRC("// Apply color matrix");
@@ skipping 88 matching lines @@
       else
         SRC("gl_FragColor = ApplyBlendMode(texColor, 0.0);");
       break;
   }
   source += "}\n";
 
   return header + source;
 }
 
 }  // namespace cc