The great shader refactor: Move all programs to a common cache

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 309 matching lines @@
 
   // Video shaders.
   typedef ProgramBinding<FragmentShaderBase> VideoStreamTextureProgram;
   typedef ProgramBinding<FragmentShaderYUVVideo> VideoYUVProgram;
 
   // Special purpose / effects shaders.
   typedef ProgramBinding<FragmentShaderBase> DebugBorderProgram;
   typedef ProgramBinding<FragmentShaderBase> SolidColorProgram;
   typedef ProgramBinding<FragmentShaderBase> SolidColorProgramAA;
 
+  typedef ProgramBinding<FragmentShaderBase> Program;
+  const Program* GetProgram(const ProgramKey& desc);
+  const Program* GetProgramForTesting(const ProgramKey& desc) const;
+
   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);
@@ skipping 47 matching lines @@
                                             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();
 

[ccameron, 2017/01/05 10:32:27]

Avoiding adding another dimension to all of these arrays is the motivation for
this part of the cleanup.

[enne (OOO), 2017/01/09 19:46:48]

Thank you for continuing to clean up this mess.  It's kind of a precarious house
of cards that just doesn't need to get touched very often, soooooo

-  TileProgram
-      tile_program_[LAST_TEX_COORD_PRECISION + 1][LAST_SAMPLER_TYPE + 1];
-  TileProgramOpaque
-      tile_program_opaque_[LAST_TEX_COORD_PRECISION + 1][LAST_SAMPLER_TYPE + 1];
-  TileProgramAA
-      tile_program_aa_[LAST_TEX_COORD_PRECISION + 1][LAST_SAMPLER_TYPE + 1];
-  TileProgramSwizzle tile_program_swizzle_[LAST_TEX_COORD_PRECISION +
-                                           1][LAST_SAMPLER_TYPE + 1];
-  TileProgramSwizzleOpaque
-      tile_program_swizzle_opaque_[LAST_TEX_COORD_PRECISION +
-                                   1][LAST_SAMPLER_TYPE + 1];
-  TileProgramSwizzleAA tile_program_swizzle_aa_[LAST_TEX_COORD_PRECISION +
-                                                1][LAST_SAMPLER_TYPE + 1];
-
-  TextureProgram
-      texture_program_[LAST_TEX_COORD_PRECISION + 1][LAST_SAMPLER_TYPE + 1];
-  NonPremultipliedTextureProgram
-      nonpremultiplied_texture_program_[LAST_TEX_COORD_PRECISION +
-                                        1][LAST_SAMPLER_TYPE + 1];
-  TextureBackgroundProgram
-      texture_background_program_[LAST_TEX_COORD_PRECISION +
-                                  1][LAST_SAMPLER_TYPE + 1];
-  NonPremultipliedTextureBackgroundProgram
-      nonpremultiplied_texture_background_program_[LAST_TEX_COORD_PRECISION +
-                                                   1][LAST_SAMPLER_TYPE + 1];
-
-  RenderPassProgram
-      render_pass_program_[LAST_TEX_COORD_PRECISION + 1][LAST_BLEND_MODE + 1];
-  RenderPassProgramAA render_pass_program_aa_[LAST_TEX_COORD_PRECISION +
-                                              1][LAST_BLEND_MODE + 1];
-  RenderPassMaskProgram
-      render_pass_mask_program_[LAST_TEX_COORD_PRECISION + 1]
-                               [LAST_SAMPLER_TYPE + 1]
-                               [LAST_BLEND_MODE + 1]
-                               [LAST_MASK_VALUE + 1];
-  RenderPassMaskProgramAA
-      render_pass_mask_program_aa_[LAST_TEX_COORD_PRECISION + 1]
-                                  [LAST_SAMPLER_TYPE + 1]
-                                  [LAST_BLEND_MODE + 1]
-                                  [LAST_MASK_VALUE + 1];
-  RenderPassColorMatrixProgram
-      render_pass_color_matrix_program_[LAST_TEX_COORD_PRECISION +
-                                        1][LAST_BLEND_MODE + 1];
-  RenderPassColorMatrixProgramAA
-      render_pass_color_matrix_program_aa_[LAST_TEX_COORD_PRECISION +
-                                           1][LAST_BLEND_MODE + 1];
-  RenderPassMaskColorMatrixProgram
-      render_pass_mask_color_matrix_program_[LAST_TEX_COORD_PRECISION + 1]
-                                            [LAST_SAMPLER_TYPE + 1]
-                                            [LAST_BLEND_MODE + 1]
-                                            [LAST_MASK_VALUE + 1];
-  RenderPassMaskColorMatrixProgramAA
-      render_pass_mask_color_matrix_program_aa_[LAST_TEX_COORD_PRECISION + 1]
-                                               [LAST_SAMPLER_TYPE + 1]
-                                               [LAST_BLEND_MODE + 1]
-                                               [LAST_MASK_VALUE + 1];
-
+  std::unordered_map<ProgramKey, Program*, ProgramKeyHash> program_cache_;

[enne (OOO), 2017/01/09 19:46:48]

Can you make the Program* a unique_ptr<Program>?

[ccameron, 2017/01/11 09:46:39]

Yes, good point!

   VideoYUVProgram video_yuv_program_[LAST_TEX_COORD_PRECISION + 1]
                                     [LAST_SAMPLER_TYPE + 1][2][2][2];
-  VideoStreamTextureProgram
-      video_stream_texture_program_[LAST_TEX_COORD_PRECISION + 1];
-
-  DebugBorderProgram debug_border_program_;
-  SolidColorProgram solid_color_program_;
-  SolidColorProgramAA solid_color_program_aa_;
 
   gpu::gles2::GLES2Interface* gl_;
   gpu::ContextSupport* context_support_;
   std::unique_ptr<ContextCacheController::ScopedVisibility> context_visibility_;
 
   TextureMailboxDeleter* texture_mailbox_deleter_;
 
   gfx::Rect swap_buffer_rect_;
   gfx::Rect scissor_rect_;
   bool is_using_bind_uniform_;
@@ skipping 38 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_