The great shader refactor: Clean up GLRenderer

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 107 matching lines @@
   FRAG_COLOR_MODE_OPAQUE,
   FRAG_COLOR_MODE_APPLY_BLEND_MODE,
 };
 
 enum MaskMode {
   NO_MASK = 0,
   HAS_MASK = 1,
   LAST_MASK_VALUE = HAS_MASK
 };
 
-struct ShaderLocations {
-  ShaderLocations();
-
-  int sampler = -1;
-  int quad = -1;
-  int edge = -1;
-  int viewport = -1;
-  int mask_sampler = -1;
-  int mask_tex_coord_scale = -1;
-  int mask_tex_coord_offset = -1;
-  int matrix = -1;
-  int alpha = -1;
-  int color_matrix = -1;
-  int color_offset = -1;
-  int vertex_tex_transform = -1;
-  int backdrop = -1;
-  int backdrop_rect = -1;
-  int original_backdrop = -1;
-};
-
 // Note: The highp_threshold_cache must be provided by the caller to make
 // the caching multi-thread/context safe in an easy low-overhead manner.
 // The caller must make sure to clear highp_threshold_cache to 0, so it can be
 // reinitialized, if a new or different context is used.
 CC_EXPORT TexCoordPrecision
     TexCoordPrecisionRequired(gpu::gles2::GLES2Interface* context,
                               int* highp_threshold_cache,
                               int highp_threshold_min,
                               const gfx::Point& max_coordinate);
 
 CC_EXPORT TexCoordPrecision TexCoordPrecisionRequired(
     gpu::gles2::GLES2Interface* context,
     int *highp_threshold_cache,
     int highp_threshold_min,
     const gfx::Size& max_size);
 
 class VertexShaderBase {
  public:
   VertexShaderBase();
   void Init(gpu::gles2::GLES2Interface* context,
             unsigned program,
             int* base_uniform_index);
   std::string GetShaderString() const;
-  void FillLocations(ShaderLocations* locations) const;
-
-  int vertex_tex_transform_location() const {
-    return vertex_tex_transform_location_;
-  }
-
-  int tex_matrix_location() const { return tex_matrix_location_; }
-
-  int ya_tex_scale_location() const { return ya_tex_scale_location_; }
-  int ya_tex_offset_location() const { return ya_tex_offset_location_; }
-  int uv_tex_scale_location() const { return uv_tex_scale_location_; }
-  int uv_tex_offset_location() const { return uv_tex_offset_location_; }
-
-  int matrix_location() const { return matrix_location_; }
-
-  int vertex_opacity_location() const { return vertex_opacity_location_; }
-
-  int viewport_location() const { return viewport_location_; }
-  int edge_location() const { return edge_location_; }
-
-  int quad_location() const { return quad_location_; }
 
  protected:
   template <class VertexShader, class FragmentShader>
   friend class ProgramBinding;
 
   // Use arrays of uniforms for matrix, texTransform, and opacity.
   bool use_uniform_arrays_ = false;
 
   PositionSource position_source_ = POSITION_SOURCE_ATTRIBUTE;
   TexCoordSource tex_coord_source_ = TEX_COORD_SOURCE_NONE;
@@ skipping 31 matching lines @@
   int viewport_location_ = -1;
   int edge_location_ = -1;
 };
 
 class FragmentShaderBase {
  public:
   virtual void Init(gpu::gles2::GLES2Interface* context,
                     unsigned program,
                     int* base_uniform_index);
   std::string GetShaderString() const;
-  void FillLocations(ShaderLocations* locations) const;
-
-  int sampler_location() const { return sampler_location_; }
-  int alpha_location() const { return alpha_location_; }
-  int color_location() const { return color_location_; }
-  int background_color_location() const { return background_color_location_; }
-  int fragment_tex_transform_location() const {
-    return fragment_tex_transform_location_;
-  }
 
  protected:
   FragmentShaderBase();
   virtual std::string GetShaderSource() const;
   bool has_blend_mode() const { return blend_mode_ != BLEND_MODE_NONE; }
 
   std::string SetBlendModeFunctions(const std::string& shader_string) const;
 
   // Settings that are modified by sub-classes.
   AAMode aa_mode_ = NO_AA;
@@ skipping 100 matching lines @@
   int yuv_adj_location_ = -1;
   int ya_clamp_rect_location_ = -1;
   int uv_clamp_rect_location_ = -1;
   int resource_multiplier_location_ = -1;
   int resource_offset_location_ = -1;
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_SHADER_H_