cc: Separate YUV from LUT color conversion

cc/output/shader.h

 // 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.
 
 #ifndef CC_OUTPUT_SHADER_H_
 #define CC_OUTPUT_SHADER_H_
 
 #include <string>
 
 #include "base/logging.h"
@@ skipping 115 matching lines @@
 
 enum YUVAlphaTextureMode {
   YUV_ALPHA_TEXTURE_MODE_NA,
   YUV_NO_ALPHA_TEXTURE,
   YUV_HAS_ALPHA_TEXTURE,
 };
 
 enum ColorConversionMode {
   // No color conversion is performed.
   COLOR_CONVERSION_MODE_NONE,
-  // Conversion is done directly from YUV to output RGB space, via a 3D texture
-  // represented as a 2D texture.
-  COLOR_CONVERSION_MODE_LUT_FROM_YUV,
+  // Conversion is done directly from input RGB space (or YUV space if
+  // applicable) to output RGB space, via a 3D texture represented as a 2D
+  // texture.
+  COLOR_CONVERSION_MODE_LUT,
 };
 
 // TODO(ccameron): Merge this with BlendMode.
 enum FragColorMode {
   FRAG_COLOR_MODE_DEFAULT,
   FRAG_COLOR_MODE_OPAQUE,
   FRAG_COLOR_MODE_APPLY_BLEND_MODE,
 };
 
 enum MaskMode {
@@ skipping 138 matching lines @@
 
   // YUV uniform locations.
   int y_texture_location_ = -1;
   int u_texture_location_ = -1;
   int v_texture_location_ = -1;
   int uv_texture_location_ = -1;
   int a_texture_location_ = -1;
   int ya_clamp_rect_location_ = -1;
   int uv_clamp_rect_location_ = -1;
 
-  // Analytic YUV to RGB convertion.
-  int yuv_matrix_location_ = -1;
-  int yuv_adj_location_ = -1;
+  // This matrix will convert from the values read in the YUV texture to
+  // RGB (including resource offset and scale). If we are using LUT based
+  // color conversion, then this will only perform resource offset and scale.
+  int yuv_and_resource_matrix_location_ = -1;
 
   // LUT YUV to color-converted RGB.
   int lut_texture_location_ = -1;
   int lut_size_location_ = -1;
-  int resource_multiplier_location_ = -1;
-  int resource_offset_location_ = -1;
 
  private:
   friend class Program;
 
   std::string GetHelperFunctions() const;
   std::string GetBlendFunction() const;
   std::string GetBlendFunctionBodyForAlpha() const;
   std::string GetBlendFunctionBodyForRGB() const;
 
   DISALLOW_COPY_AND_ASSIGN(FragmentShader);
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_SHADER_H_