| Index: cc/output/gl_renderer.h
|
| diff --git a/cc/output/gl_renderer.h b/cc/output/gl_renderer.h
|
| index a379dc00509f4ccab08fe1d1c903167548d98db7..1d619d50f7225424dfca64a9d7d34035a239fedb 100644
|
| --- a/cc/output/gl_renderer.h
|
| +++ b/cc/output/gl_renderer.h
|
| @@ -333,17 +333,21 @@ class CC_EXPORT GLRenderer : public DirectRenderer {
|
| const RenderPassProgramAA* GetRenderPassProgramAA(
|
| TexCoordPrecision precision);
|
| const RenderPassMaskProgram* GetRenderPassMaskProgram(
|
| - TexCoordPrecision precision);
|
| + TexCoordPrecision precision,
|
| + SamplerType sampler);
|
| const RenderPassMaskProgramAA* GetRenderPassMaskProgramAA(
|
| - TexCoordPrecision precision);
|
| + TexCoordPrecision precision,
|
| + SamplerType sampler);
|
| const RenderPassColorMatrixProgram* GetRenderPassColorMatrixProgram(
|
| TexCoordPrecision precision);
|
| const RenderPassColorMatrixProgramAA* GetRenderPassColorMatrixProgramAA(
|
| TexCoordPrecision precision);
|
| const RenderPassMaskColorMatrixProgram* GetRenderPassMaskColorMatrixProgram(
|
| - TexCoordPrecision precision);
|
| + TexCoordPrecision precision,
|
| + SamplerType sampler);
|
| const RenderPassMaskColorMatrixProgramAA*
|
| - GetRenderPassMaskColorMatrixProgramAA(TexCoordPrecision precision);
|
| + GetRenderPassMaskColorMatrixProgramAA(TexCoordPrecision precision,
|
| + SamplerType sampler);
|
|
|
| const TextureProgram* GetTextureProgram(
|
| TexCoordPrecision precision);
|
| @@ -390,16 +394,18 @@ class CC_EXPORT GLRenderer : public DirectRenderer {
|
|
|
| RenderPassProgram render_pass_program_[NumTexCoordPrecisions];
|
| RenderPassProgramAA render_pass_program_aa_[NumTexCoordPrecisions];
|
| - RenderPassMaskProgram render_pass_mask_program_[NumTexCoordPrecisions];
|
| - RenderPassMaskProgramAA render_pass_mask_program_aa_[NumTexCoordPrecisions];
|
| + RenderPassMaskProgram
|
| + render_pass_mask_program_[NumTexCoordPrecisions][NumSamplerTypes];
|
| + RenderPassMaskProgramAA
|
| + render_pass_mask_program_aa_[NumTexCoordPrecisions][NumSamplerTypes];
|
| 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];
|
| + RenderPassMaskColorMatrixProgram render_pass_mask_color_matrix_program_
|
| + [NumTexCoordPrecisions][NumSamplerTypes];
|
| + RenderPassMaskColorMatrixProgramAA render_pass_mask_color_matrix_program_aa_
|
| + [NumTexCoordPrecisions][NumSamplerTypes];
|
|
|
| VideoYUVProgram video_yuv_program_[NumTexCoordPrecisions];
|
| VideoYUVAProgram video_yuva_program_[NumTexCoordPrecisions];
|
|
|