The great shader refactor: Clean up GLRenderer

cc/output/gl_renderer.h

 // Copyright 2010 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_GL_RENDERER_H_
 #define CC_OUTPUT_GL_RENDERER_H_
 
 #include <deque>
 #include <vector>
 
@@ skipping 272 matching lines @@
   // Resources that the GPU process has finished swapping. The key is the
   // texture id of the resource.
   std::map<unsigned, OverlayResourceLock> swapped_and_acked_overlay_resources_;
 
   unsigned offscreen_framebuffer_id_;
 
   std::unique_ptr<StaticGeometryBinding> shared_geometry_;
   std::unique_ptr<DynamicGeometryBinding> clipped_geometry_;
   gfx::QuadF shared_geometry_quad_;
 
-  // This block of bindings defines all of the programs used by the compositor
-  // itself.  Add any new programs here to GLRendererShaderTest.
-
-  // Tiled layer shaders.
-  typedef Program TileProgram;
-  typedef Program TileProgramAA;
-  typedef Program TileProgramSwizzleAA;
-  typedef Program TileProgramOpaque;
-  typedef Program TileProgramSwizzle;
-  typedef Program TileProgramSwizzleOpaque;
-
-  // Texture shaders.
-  typedef Program TextureProgram;
-  typedef Program NonPremultipliedTextureProgram;
-  typedef Program TextureBackgroundProgram;
-  typedef Program NonPremultipliedTextureBackgroundProgram;
-
-  // Render surface shaders.
-  typedef Program RenderPassProgram;
-  typedef Program RenderPassMaskProgram;
-  typedef Program RenderPassProgramAA;
-  typedef Program RenderPassMaskProgramAA;
-  typedef Program RenderPassColorMatrixProgram;
-  typedef Program RenderPassMaskColorMatrixProgramAA;
-  typedef Program RenderPassColorMatrixProgramAA;
-  typedef Program RenderPassMaskColorMatrixProgram;
-
-  // Video shaders.
-  typedef Program VideoStreamTextureProgram;
-  typedef ProgramBinding<VertexShaderBase, FragmentShaderYUVVideo>
-      VideoYUVProgram;
-
-  // Special purpose / effects shaders.
-  typedef Program DebugBorderProgram;
-  typedef Program SolidColorProgram;
-  typedef Program SolidColorProgramAA;
-
   // If the requested program has not yet been initialized, this will initialize
   // the program before returning it.
   const Program* GetProgram(const ProgramKey& key);
 
   // This will return nullptr if the requested program has not yet been
   // initialized.
   const Program* GetProgramIfInitialized(const ProgramKey& key) const;
 
   std::unordered_map<ProgramKey, std::unique_ptr<Program>, ProgramKeyHash>
       program_cache_;
 
-  const TileProgram* GetTileProgram(
-      TexCoordPrecision precision, SamplerType sampler);
-  const TileProgramOpaque* GetTileProgramOpaque(
-      TexCoordPrecision precision, SamplerType sampler);
-  const TileProgramAA* GetTileProgramAA(
-      TexCoordPrecision precision, SamplerType sampler);
-  const TileProgramSwizzle* GetTileProgramSwizzle(
-      TexCoordPrecision precision, SamplerType sampler);
-  const TileProgramSwizzleOpaque* GetTileProgramSwizzleOpaque(
-      TexCoordPrecision precision, SamplerType sampler);
-  const TileProgramSwizzleAA* GetTileProgramSwizzleAA(
-      TexCoordPrecision precision, SamplerType sampler);
-
-  const RenderPassProgram* GetRenderPassProgram(TexCoordPrecision precision,
-                                                BlendMode blend_mode);
-  const RenderPassProgramAA* GetRenderPassProgramAA(TexCoordPrecision precision,
-                                                    BlendMode blend_mode);
-  const RenderPassMaskProgram* GetRenderPassMaskProgram(
-      TexCoordPrecision precision,
-      SamplerType sampler,
-      BlendMode blend_mode,
-      bool mask_for_background);
-  const RenderPassMaskProgramAA* GetRenderPassMaskProgramAA(
-      TexCoordPrecision precision,
-      SamplerType sampler,
-      BlendMode blend_mode,
-      bool mask_for_background);
-  const RenderPassColorMatrixProgram* GetRenderPassColorMatrixProgram(
-      TexCoordPrecision precision,
-      BlendMode blend_mode);
-  const RenderPassColorMatrixProgramAA* GetRenderPassColorMatrixProgramAA(
-      TexCoordPrecision precision,
-      BlendMode blend_mode);
-  const RenderPassMaskColorMatrixProgram* GetRenderPassMaskColorMatrixProgram(
-      TexCoordPrecision precision,
-      SamplerType sampler,
-      BlendMode blend_mode,
-      bool mask_for_background);
-  const RenderPassMaskColorMatrixProgramAA*
-  GetRenderPassMaskColorMatrixProgramAA(TexCoordPrecision precision,
-                                        SamplerType sampler,
-                                        BlendMode blend_mode,
-                                        bool mask_for_background);
-
-  const TextureProgram* GetTextureProgram(TexCoordPrecision precision,
-                                          SamplerType sampler);
-  const NonPremultipliedTextureProgram* GetNonPremultipliedTextureProgram(
-      TexCoordPrecision precision,
-      SamplerType sampler);
-  const TextureBackgroundProgram* GetTextureBackgroundProgram(
-      TexCoordPrecision precision,
-      SamplerType sampler);
-  const NonPremultipliedTextureBackgroundProgram*
-  GetNonPremultipliedTextureBackgroundProgram(TexCoordPrecision precision,
-                                              SamplerType sampler);
-
+  typedef ProgramBinding<VertexShaderBase, FragmentShaderYUVVideo>
+      VideoYUVProgram;
   const VideoYUVProgram* GetVideoYUVProgram(TexCoordPrecision precision,
                                             SamplerType sampler,
                                             bool use_alpha_texture,
                                             bool use_nv12,
                                             bool use_color_lut);
-  const VideoStreamTextureProgram* GetVideoStreamTextureProgram(
-      TexCoordPrecision precision);
-
-  const DebugBorderProgram* GetDebugBorderProgram();
-  const SolidColorProgram* GetSolidColorProgram();
-  const SolidColorProgramAA* GetSolidColorProgramAA();
-
   VideoYUVProgram video_yuv_program_[LAST_TEX_COORD_PRECISION + 1]
                                     [LAST_SAMPLER_TYPE + 1][2][2][2];
 
   gpu::gles2::GLES2Interface* gl_;
   gpu::ContextSupport* context_support_;
   std::unique_ptr<ContextCacheController::ScopedVisibility> context_visibility_;
 
   TextureMailboxDeleter* texture_mailbox_deleter_;
 
   gfx::Rect swap_buffer_rect_;
@@ skipping 40 matching lines @@
   bool force_drawing_frame_framebuffer_unflipped_ = false;
 
   BoundGeometry bound_geometry_;
   ColorLUTCache color_lut_cache_;
   DISALLOW_COPY_AND_ASSIGN(GLRenderer);
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_GL_RENDERER_H_