Make LUTs independent of YUV in cc shaders

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 112 matching lines @@
   // U and V planes have separate textures.
   UV_TEXTURE_MODE_U_V,
 };
 
 enum YUVAlphaTextureMode {
   YUV_ALPHA_TEXTURE_MODE_NA,
   YUV_NO_ALPHA_TEXTURE,
   YUV_HAS_ALPHA_TEXTURE,
 };
 
-enum ColorConversionMode {

[ccameron, 2017/02/02 23:38:07]

Please leave this as an enum instead of a boolean (I've been being emphatic
about using enums instead of booleans here because otherwise the shader
descriptions are "false, true, false, false").

-  // 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,
-};
-
 // TODO(ccameron): Merge this with BlendMode.
 enum FragColorMode {
   FRAG_COLOR_MODE_DEFAULT,
   FRAG_COLOR_MODE_OPAQUE,
   FRAG_COLOR_MODE_APPLY_BLEND_MODE,
 };
 
 enum MaskMode {
   NO_MASK = 0,
   HAS_MASK = 1,
@@ skipping 125 matching lines @@
   TexCoordPrecision tex_coord_precision_ = TEX_COORD_PRECISION_NA;
   SamplerType sampler_type_ = SAMPLER_TYPE_NA;
 
   BlendMode blend_mode_ = BLEND_MODE_NONE;
   bool mask_for_background_ = false;
 
   // YUV-only parameters.
   YUVAlphaTextureMode yuv_alpha_texture_mode_ = YUV_ALPHA_TEXTURE_MODE_NA;
   UVTextureMode uv_texture_mode_ = UV_TEXTURE_MODE_UV;
 
-  ColorConversionMode color_conversion_mode_ = COLOR_CONVERSION_MODE_NONE;
-
   // 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;

[ccameron, 2017/02/02 23:38:07]

Please continue to use these uniforms instead of color_matrix.

The |color_matrix| uniform is for color filters (e.g, a sepia filter), which is
orthogonal to color conversion (and, in principle, could be applied at the same
time as a YUV to RGB conversion).

-
-  // LUT YUV to color-converted RGB.
+  // LUT
+  bool has_lut_ = false;
   int lut_texture_location_ = -1;
   int lut_size_location_ = -1;
+
+  bool has_resource_offset_ = false;
   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_