Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(201)

Unified Diff: cc/output/gl_renderer.h

Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/output/direct_renderer.cc ('k') | cc/output/gl_renderer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/gl_renderer.h
diff --git a/cc/output/gl_renderer.h b/cc/output/gl_renderer.h
index 25c70968ee8c23648125fe4ad06d30708a6abfc9..22e7706d778769018a0a504eb0e70149f4f94b64 100644
--- a/cc/output/gl_renderer.h
+++ b/cc/output/gl_renderer.h
@@ -376,62 +376,47 @@ class CC_EXPORT GLRenderer : public DirectRenderer {
const SolidColorProgram* GetSolidColorProgram();
const SolidColorProgramAA* GetSolidColorProgramAA();
- TileProgram
- tile_program_[LAST_TEX_COORD_PRECISION + 1][LAST_SAMPLER_TYPE + 1];
+ TileProgram tile_program_[NumTexCoordPrecisions][NumSamplerTypes];
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];
+ tile_program_opaque_[NumTexCoordPrecisions][NumSamplerTypes];
+ TileProgramAA tile_program_aa_[NumTexCoordPrecisions][NumSamplerTypes];
+ TileProgramSwizzle
+ tile_program_swizzle_[NumTexCoordPrecisions][NumSamplerTypes];
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];
+ tile_program_swizzle_opaque_[NumTexCoordPrecisions][NumSamplerTypes];
+ TileProgramSwizzleAA
+ tile_program_swizzle_aa_[NumTexCoordPrecisions][NumSamplerTypes];
TileCheckerboardProgram tile_checkerboard_program_;
- TextureProgram texture_program_[LAST_TEX_COORD_PRECISION + 1];
+ TextureProgram texture_program_[NumTexCoordPrecisions];
NonPremultipliedTextureProgram
- nonpremultiplied_texture_program_[LAST_TEX_COORD_PRECISION + 1];
- TextureBackgroundProgram
- texture_background_program_[LAST_TEX_COORD_PRECISION + 1];
+ nonpremultiplied_texture_program_[NumTexCoordPrecisions];
+ TextureBackgroundProgram texture_background_program_[NumTexCoordPrecisions];
NonPremultipliedTextureBackgroundProgram
- nonpremultiplied_texture_background_program_[LAST_TEX_COORD_PRECISION +
- 1];
- TextureProgram texture_io_surface_program_[LAST_TEX_COORD_PRECISION + 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];
- RenderPassMaskProgramAA
- render_pass_mask_program_aa_[LAST_TEX_COORD_PRECISION +
- 1][LAST_SAMPLER_TYPE + 1][LAST_BLEND_MODE +
- 1];
+ nonpremultiplied_texture_background_program_[NumTexCoordPrecisions];
+ TextureProgram texture_io_surface_program_[NumTexCoordPrecisions];
+
+ RenderPassProgram render_pass_program_[NumTexCoordPrecisions][NumBlendModes];
+ RenderPassProgramAA
+ render_pass_program_aa_[NumTexCoordPrecisions][NumBlendModes];
+ RenderPassMaskProgram render_pass_mask_program_
+ [NumTexCoordPrecisions][NumSamplerTypes][NumBlendModes];
+ RenderPassMaskProgramAA render_pass_mask_program_aa_
+ [NumTexCoordPrecisions][NumSamplerTypes][NumBlendModes];
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];
- RenderPassMaskColorMatrixProgramAA
- render_pass_mask_color_matrix_program_aa_[LAST_TEX_COORD_PRECISION +
- 1][LAST_SAMPLER_TYPE +
- 1][LAST_BLEND_MODE + 1];
-
- VideoYUVProgram video_yuv_program_[LAST_TEX_COORD_PRECISION + 1];
- VideoYUVAProgram video_yuva_program_[LAST_TEX_COORD_PRECISION + 1];
+ render_pass_color_matrix_program_[NumTexCoordPrecisions][NumBlendModes];
+ RenderPassColorMatrixProgramAA render_pass_color_matrix_program_aa_
+ [NumTexCoordPrecisions][NumBlendModes];
+ RenderPassMaskColorMatrixProgram render_pass_mask_color_matrix_program_
+ [NumTexCoordPrecisions][NumSamplerTypes][NumBlendModes];
+ RenderPassMaskColorMatrixProgramAA render_pass_mask_color_matrix_program_aa_
+ [NumTexCoordPrecisions][NumSamplerTypes][NumBlendModes];
+
+ VideoYUVProgram video_yuv_program_[NumTexCoordPrecisions];
+ VideoYUVAProgram video_yuva_program_[NumTexCoordPrecisions];
VideoStreamTextureProgram
- video_stream_texture_program_[LAST_TEX_COORD_PRECISION + 1];
+ video_stream_texture_program_[NumTexCoordPrecisions];
DebugBorderProgram debug_border_program_;
SolidColorProgram solid_color_program_;
« no previous file with comments | « cc/output/direct_renderer.cc ('k') | cc/output/gl_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698