Index: cc/output/gl_renderer.h |
diff --git a/cc/output/gl_renderer.h b/cc/output/gl_renderer.h |
index 676e7b7104d98f9f7c969aec2449bcc7bc3b00fe..6162e1280961e7385567077349d68e47e14c05f9 100644 |
--- a/cc/output/gl_renderer.h |
+++ b/cc/output/gl_renderer.h |
@@ -334,9 +334,11 @@ class CC_EXPORT GLRenderer : public DirectRenderer { |
BlendMode blend_mode); |
const RenderPassMaskProgram* GetRenderPassMaskProgram( |
TexCoordPrecision precision, |
+ SamplerType sampler, |
BlendMode blend_mode); |
const RenderPassMaskProgramAA* GetRenderPassMaskProgramAA( |
TexCoordPrecision precision, |
+ SamplerType sampler, |
BlendMode blend_mode); |
const RenderPassColorMatrixProgram* GetRenderPassColorMatrixProgram( |
TexCoordPrecision precision, |
@@ -346,9 +348,11 @@ class CC_EXPORT GLRenderer : public DirectRenderer { |
BlendMode blend_mode); |
const RenderPassMaskColorMatrixProgram* GetRenderPassMaskColorMatrixProgram( |
TexCoordPrecision precision, |
+ SamplerType sampler, |
BlendMode blend_mode); |
const RenderPassMaskColorMatrixProgramAA* |
GetRenderPassMaskColorMatrixProgramAA(TexCoordPrecision precision, |
+ SamplerType sampler, |
BlendMode blend_mode); |
const TextureProgram* GetTextureProgram( |
@@ -397,18 +401,18 @@ class CC_EXPORT GLRenderer : public DirectRenderer { |
RenderPassProgram render_pass_program_[NumTexCoordPrecisions][NumBlendModes]; |
RenderPassProgramAA |
render_pass_program_aa_[NumTexCoordPrecisions][NumBlendModes]; |
- RenderPassMaskProgram |
- render_pass_mask_program_[NumTexCoordPrecisions][NumBlendModes]; |
- RenderPassMaskProgramAA |
- render_pass_mask_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_[NumTexCoordPrecisions][NumBlendModes]; |
RenderPassColorMatrixProgramAA render_pass_color_matrix_program_aa_ |
[NumTexCoordPrecisions][NumBlendModes]; |
RenderPassMaskColorMatrixProgram render_pass_mask_color_matrix_program_ |
- [NumTexCoordPrecisions][NumBlendModes]; |
+ [NumTexCoordPrecisions][NumSamplerTypes][NumBlendModes]; |
RenderPassMaskColorMatrixProgramAA render_pass_mask_color_matrix_program_aa_ |
- [NumTexCoordPrecisions][NumBlendModes]; |
+ [NumTexCoordPrecisions][NumSamplerTypes][NumBlendModes]; |
VideoYUVProgram video_yuv_program_[NumTexCoordPrecisions]; |
VideoYUVAProgram video_yuva_program_[NumTexCoordPrecisions]; |