cc: Allow TEXTURE_RECTANGLE_ARB to be used for tile textures.

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 "base/cancelable_callback.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/scoped_ptr_vector.h"
@@ skipping 246 matching lines @@
                          FragmentShaderRGBATexVaryingAlpha> TextureProgram;
   typedef ProgramBinding<VertexShaderPosTexTransform,
                          FragmentShaderRGBATexPremultiplyAlpha>
       NonPremultipliedTextureProgram;
   typedef ProgramBinding<VertexShaderPosTexTransform,
                          FragmentShaderTexBackgroundVaryingAlpha>
       TextureBackgroundProgram;
   typedef ProgramBinding<VertexShaderPosTexTransform,
                          FragmentShaderTexBackgroundPremultiplyAlpha>
       NonPremultipliedTextureBackgroundProgram;
-  typedef ProgramBinding<VertexShaderPosTexTransform,
-                         FragmentShaderRGBATexRectVaryingAlpha>
-      TextureIOSurfaceProgram;
 
   // Render surface shaders.
   typedef ProgramBinding<VertexShaderPosTexTransform,
                          FragmentShaderRGBATexAlpha> RenderPassProgram;
   typedef ProgramBinding<VertexShaderPosTexTransform,
                          FragmentShaderRGBATexAlphaMask> RenderPassMaskProgram;
   typedef ProgramBinding<VertexShaderQuadTexTransformAA,
                          FragmentShaderRGBATexAlphaAA> RenderPassProgramAA;
   typedef ProgramBinding<VertexShaderQuadTexTransformAA,
                          FragmentShaderRGBATexAlphaMaskAA>
       RenderPassMaskProgramAA;
   typedef ProgramBinding<VertexShaderPosTexTransform,
                          FragmentShaderRGBATexColorMatrixAlpha>
       RenderPassColorMatrixProgram;
   typedef ProgramBinding<VertexShaderQuadTexTransformAA,
                          FragmentShaderRGBATexAlphaMaskColorMatrixAA>
       RenderPassMaskColorMatrixProgramAA;
   typedef ProgramBinding<VertexShaderQuadTexTransformAA,
                          FragmentShaderRGBATexAlphaColorMatrixAA>
       RenderPassColorMatrixProgramAA;
   typedef ProgramBinding<VertexShaderPosTexTransform,
                          FragmentShaderRGBATexAlphaMaskColorMatrix>
       RenderPassMaskColorMatrixProgram;
 
   // Video shaders.
-  typedef ProgramBinding<VertexShaderVideoTransform,
-                         FragmentShaderOESImageExternal>
+  typedef ProgramBinding<VertexShaderVideoTransform, FragmentShaderRGBATex>
       VideoStreamTextureProgram;
   typedef ProgramBinding<VertexShaderPosTexYUVStretch, FragmentShaderYUVVideo>
       VideoYUVProgram;
   typedef ProgramBinding<VertexShaderPosTexYUVStretch, FragmentShaderYUVAVideo>
       VideoYUVAProgram;
 
   // Special purpose / effects shaders.
   typedef ProgramBinding<VertexShaderPos, FragmentShaderColor>
       DebugBorderProgram;
   typedef ProgramBinding<VertexShaderQuad, FragmentShaderColor>
       SolidColorProgram;
   typedef ProgramBinding<VertexShaderQuadAA, FragmentShaderColorAA>
       SolidColorProgramAA;
 
-  const TileProgram* GetTileProgram(TexCoordPrecision precision);
-  const TileProgramOpaque* GetTileProgramOpaque(TexCoordPrecision precision);
-  const TileProgramAA* GetTileProgramAA(TexCoordPrecision precision);
-  const TileProgramSwizzle* GetTileProgramSwizzle(TexCoordPrecision precision);
+  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);
+      TexCoordPrecision precision, SamplerType sampler);
   const TileProgramSwizzleAA* GetTileProgramSwizzleAA(
-      TexCoordPrecision precision);
+      TexCoordPrecision precision, SamplerType sampler);
+
   const TileCheckerboardProgram* GetTileCheckerboardProgram();
 
   const RenderPassProgram* GetRenderPassProgram(
       TexCoordPrecision precision);
   const RenderPassProgramAA* GetRenderPassProgramAA(
       TexCoordPrecision precision);
   const RenderPassMaskProgram* GetRenderPassMaskProgram(
       TexCoordPrecision precision);
   const RenderPassMaskProgramAA* GetRenderPassMaskProgramAA(
       TexCoordPrecision precision);
   const RenderPassColorMatrixProgram* GetRenderPassColorMatrixProgram(
       TexCoordPrecision precision);
   const RenderPassColorMatrixProgramAA* GetRenderPassColorMatrixProgramAA(
       TexCoordPrecision precision);
   const RenderPassMaskColorMatrixProgram* GetRenderPassMaskColorMatrixProgram(
       TexCoordPrecision precision);
   const RenderPassMaskColorMatrixProgramAA*
       GetRenderPassMaskColorMatrixProgramAA(TexCoordPrecision precision);
 
   const TextureProgram* GetTextureProgram(
       TexCoordPrecision precision);
   const NonPremultipliedTextureProgram* GetNonPremultipliedTextureProgram(
       TexCoordPrecision precision);
   const TextureBackgroundProgram* GetTextureBackgroundProgram(
       TexCoordPrecision precision);
   const NonPremultipliedTextureBackgroundProgram*
       GetNonPremultipliedTextureBackgroundProgram(TexCoordPrecision precision);
-  const TextureIOSurfaceProgram* GetTextureIOSurfaceProgram(
+  const TextureProgram* GetTextureIOSurfaceProgram(
       TexCoordPrecision precision);
 
   const VideoYUVProgram* GetVideoYUVProgram(
       TexCoordPrecision precision);
   const VideoYUVAProgram* GetVideoYUVAProgram(
       TexCoordPrecision precision);
   const VideoStreamTextureProgram* GetVideoStreamTextureProgram(
       TexCoordPrecision precision);
 
   const DebugBorderProgram* GetDebugBorderProgram();
   const SolidColorProgram* GetSolidColorProgram();
   const SolidColorProgramAA* GetSolidColorProgramAA();
 
-  TileProgram tile_program_;
-  TileProgramOpaque tile_program_opaque_;
-  TileProgramAA tile_program_aa_;
-  TileProgramSwizzle tile_program_swizzle_;
-  TileProgramSwizzleOpaque tile_program_swizzle_opaque_;
-  TileProgramSwizzleAA tile_program_swizzle_aa_;
+  TileProgram tile_program_[NumTexCoordPrecisions][NumSamplerTypes];

[epennerAtGoogle, 2013/11/22 19:27:55]

Hmm, could the program also become an enum? Then it would just be one big array.

Optional nit: I like to use a function to access such arrays, as it enforces
type safety on the enum. However probably only worth it if this becomes one
really big array.

[epennerAtGoogle, 2013/11/22 19:31:17]

Never mind regarding the functions. I see you already did this above!

+  TileProgramOpaque
+      tile_program_opaque_[NumTexCoordPrecisions][NumSamplerTypes];
+  TileProgramAA tile_program_aa_[NumTexCoordPrecisions][NumSamplerTypes];
+  TileProgramSwizzle
+      tile_program_swizzle_[NumTexCoordPrecisions][NumSamplerTypes];
+  TileProgramSwizzleOpaque
+      tile_program_swizzle_opaque_[NumTexCoordPrecisions][NumSamplerTypes];
+  TileProgramSwizzleAA
+      tile_program_swizzle_aa_[NumTexCoordPrecisions][NumSamplerTypes];
+
   TileCheckerboardProgram tile_checkerboard_program_;
 
-  TileProgram tile_program_highp_;
-  TileProgramOpaque tile_program_opaque_highp_;
-  TileProgramAA tile_program_aa_highp_;
-  TileProgramSwizzle tile_program_swizzle_highp_;
-  TileProgramSwizzleOpaque tile_program_swizzle_opaque_highp_;
-  TileProgramSwizzleAA tile_program_swizzle_aa_highp_;
+  TextureProgram texture_program_[NumTexCoordPrecisions];
+  NonPremultipliedTextureProgram
+      nonpremultiplied_texture_program_[NumTexCoordPrecisions];
+  TextureBackgroundProgram texture_background_program_[NumTexCoordPrecisions];
+  NonPremultipliedTextureBackgroundProgram
+      nonpremultiplied_texture_background_program_[NumTexCoordPrecisions];
+  TextureProgram texture_io_surface_program_[NumTexCoordPrecisions];
 
-  TextureProgram texture_program_;
-  NonPremultipliedTextureProgram nonpremultiplied_texture_program_;
-  TextureBackgroundProgram texture_background_program_;
-  NonPremultipliedTextureBackgroundProgram
-      nonpremultiplied_texture_background_program_;
-  TextureIOSurfaceProgram texture_io_surface_program_;
+  RenderPassProgram render_pass_program_[NumTexCoordPrecisions];
+  RenderPassProgramAA render_pass_program_aa_[NumTexCoordPrecisions];
+  RenderPassMaskProgram render_pass_mask_program_[NumTexCoordPrecisions];
+  RenderPassMaskProgramAA render_pass_mask_program_aa_[NumTexCoordPrecisions];
+  RenderPassColorMatrixProgram
+      render_pass_color_matrix_program_[NumTexCoordPrecisions];
+  RenderPassColorMatrixProgramAA
+      render_pass_color_matrix_program_aa_[NumTexCoordPrecisions];
+  RenderPassMaskColorMatrixProgram
+      render_pass_mask_color_matrix_program_[NumTexCoordPrecisions];
+  RenderPassMaskColorMatrixProgramAA
+      render_pass_mask_color_matrix_program_aa_[NumTexCoordPrecisions];
 
-  TextureProgram texture_program_highp_;
-  NonPremultipliedTextureProgram nonpremultiplied_texture_program_highp_;
-  TextureBackgroundProgram texture_background_program_highp_;
-  NonPremultipliedTextureBackgroundProgram
-      nonpremultiplied_texture_background_program_highp_;
-  TextureIOSurfaceProgram texture_io_surface_program_highp_;
-
-  RenderPassProgram render_pass_program_;
-  RenderPassProgramAA render_pass_program_aa_;
-  RenderPassMaskProgram render_pass_mask_program_;
-  RenderPassMaskProgramAA render_pass_mask_program_aa_;
-  RenderPassColorMatrixProgram render_pass_color_matrix_program_;
-  RenderPassColorMatrixProgramAA render_pass_color_matrix_program_aa_;
-  RenderPassMaskColorMatrixProgram render_pass_mask_color_matrix_program_;
-  RenderPassMaskColorMatrixProgramAA render_pass_mask_color_matrix_program_aa_;
-
-  RenderPassProgram render_pass_program_highp_;
-  RenderPassProgramAA render_pass_program_aa_highp_;
-  RenderPassMaskProgram render_pass_mask_program_highp_;
-  RenderPassMaskProgramAA render_pass_mask_program_aa_highp_;
-  RenderPassColorMatrixProgram render_pass_color_matrix_program_highp_;
-  RenderPassColorMatrixProgramAA render_pass_color_matrix_program_aa_highp_;
-  RenderPassMaskColorMatrixProgram render_pass_mask_color_matrix_program_highp_;
-  RenderPassMaskColorMatrixProgramAA
-      render_pass_mask_color_matrix_program_aa_highp_;
-
-  VideoYUVProgram video_yuv_program_;
-  VideoYUVAProgram video_yuva_program_;
-  VideoStreamTextureProgram video_stream_texture_program_;
-
-  VideoYUVProgram video_yuv_program_highp_;
-  VideoYUVAProgram video_yuva_program_highp_;
-  VideoStreamTextureProgram video_stream_texture_program_highp_;
+  VideoYUVProgram video_yuv_program_[NumTexCoordPrecisions];
+  VideoYUVAProgram video_yuva_program_[NumTexCoordPrecisions];
+  VideoStreamTextureProgram
+      video_stream_texture_program_[NumTexCoordPrecisions];
 
   DebugBorderProgram debug_border_program_;
   SolidColorProgram solid_color_program_;
   SolidColorProgramAA solid_color_program_aa_;
 
   blink::WebGraphicsContext3D* context_;
   gpu::ContextSupport* context_support_;
 
   skia::RefPtr<GrContext> gr_context_;
   skia::RefPtr<SkCanvas> sk_canvas_;
@@ skipping 35 matching lines @@
 #if DEBUG_GL_CALLS && !defined(NDEBUG)
 #define GLC(context, x)                                                        \
   (x, GLRenderer::DebugGLCall(&* context, #x, __FILE__, __LINE__))
 #else
 #define GLC(context, x) (x)
 #endif
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_GL_RENDERER_H_