| Index: cc/output/gl_renderer.h
|
| diff --git a/cc/output/gl_renderer.h b/cc/output/gl_renderer.h
|
| index 8dcabf9f4d042ba9fed5ca46e86f29c4f27bec65..2bf308bb9b0cf04708ce468efc2d786b5e7aca8b 100644
|
| --- a/cc/output/gl_renderer.h
|
| +++ b/cc/output/gl_renderer.h
|
| @@ -387,14 +387,17 @@ class CC_EXPORT GLRenderer : public DirectRenderer {
|
| BlendMode blend_mode,
|
| bool mask_for_background);
|
|
|
| - const TextureProgram* GetTextureProgram(
|
| - TexCoordPrecision precision);
|
| + const TextureProgram* GetTextureProgram(TexCoordPrecision precision,
|
| + SamplerType sampler);
|
| const NonPremultipliedTextureProgram* GetNonPremultipliedTextureProgram(
|
| - TexCoordPrecision precision);
|
| + TexCoordPrecision precision,
|
| + SamplerType sampler);
|
| const TextureBackgroundProgram* GetTextureBackgroundProgram(
|
| - TexCoordPrecision precision);
|
| + TexCoordPrecision precision,
|
| + SamplerType sampler);
|
| const NonPremultipliedTextureBackgroundProgram*
|
| - GetNonPremultipliedTextureBackgroundProgram(TexCoordPrecision precision);
|
| + GetNonPremultipliedTextureBackgroundProgram(TexCoordPrecision precision,
|
| + SamplerType sampler);
|
| const TextureProgram* GetTextureIOSurfaceProgram(
|
| TexCoordPrecision precision);
|
|
|
| @@ -425,14 +428,17 @@ class CC_EXPORT GLRenderer : public DirectRenderer {
|
|
|
| TileCheckerboardProgram tile_checkerboard_program_;
|
|
|
| - TextureProgram texture_program_[LAST_TEX_COORD_PRECISION + 1];
|
| + TextureProgram
|
| + texture_program_[LAST_TEX_COORD_PRECISION + 1][LAST_SAMPLER_TYPE + 1];
|
| NonPremultipliedTextureProgram
|
| - nonpremultiplied_texture_program_[LAST_TEX_COORD_PRECISION + 1];
|
| + nonpremultiplied_texture_program_[LAST_TEX_COORD_PRECISION +
|
| + 1][LAST_SAMPLER_TYPE + 1];
|
| TextureBackgroundProgram
|
| - texture_background_program_[LAST_TEX_COORD_PRECISION + 1];
|
| + texture_background_program_[LAST_TEX_COORD_PRECISION +
|
| + 1][LAST_SAMPLER_TYPE + 1];
|
| NonPremultipliedTextureBackgroundProgram
|
| nonpremultiplied_texture_background_program_[LAST_TEX_COORD_PRECISION +
|
| - 1];
|
| + 1][LAST_SAMPLER_TYPE + 1];
|
| TextureProgram texture_io_surface_program_[LAST_TEX_COORD_PRECISION + 1];
|
|
|
| RenderPassProgram
|
|
|