| Index: cc/output/gl_renderer.h
|
| diff --git a/cc/output/gl_renderer.h b/cc/output/gl_renderer.h
|
| index 2af2c3091e04adaea2d2c0b298383a841be91659..d5cc12924f7749e30118b02b17deba6dfc173b88 100644
|
| --- a/cc/output/gl_renderer.h
|
| +++ b/cc/output/gl_renderer.h
|
| @@ -294,69 +294,38 @@ class CC_EXPORT GLRenderer : public DirectRenderer {
|
| // itself. Add any new programs here to GLRendererShaderTest.
|
|
|
| // Tiled layer shaders.
|
| - typedef ProgramBinding<VertexShaderTile, FragmentShaderRGBATexAlpha>
|
| - TileProgram;
|
| - typedef ProgramBinding<VertexShaderTileAA, FragmentShaderRGBATexClampAlphaAA>
|
| - TileProgramAA;
|
| - typedef ProgramBinding<VertexShaderTileAA,
|
| - FragmentShaderRGBATexClampSwizzleAlphaAA>
|
| - TileProgramSwizzleAA;
|
| - typedef ProgramBinding<VertexShaderTile, FragmentShaderRGBATexOpaque>
|
| - TileProgramOpaque;
|
| - typedef ProgramBinding<VertexShaderTile, FragmentShaderRGBATexSwizzleAlpha>
|
| - TileProgramSwizzle;
|
| - typedef ProgramBinding<VertexShaderTile, FragmentShaderRGBATexSwizzleOpaque>
|
| - TileProgramSwizzleOpaque;
|
| + typedef ProgramBinding<FragmentShaderBase> TileProgram;
|
| + typedef ProgramBinding<FragmentShaderBase> TileProgramAA;
|
| + typedef ProgramBinding<FragmentShaderBase> TileProgramSwizzleAA;
|
| + typedef ProgramBinding<FragmentShaderBase> TileProgramOpaque;
|
| + typedef ProgramBinding<FragmentShaderBase> TileProgramSwizzle;
|
| + typedef ProgramBinding<FragmentShaderBase> TileProgramSwizzleOpaque;
|
|
|
| // Texture shaders.
|
| - typedef ProgramBinding<VertexShaderPosTexTransform,
|
| - FragmentShaderRGBATexVaryingAlpha> TextureProgram;
|
| - typedef ProgramBinding<VertexShaderPosTexTransform,
|
| - FragmentShaderRGBATexPremultiplyAlpha>
|
| - NonPremultipliedTextureProgram;
|
| - typedef ProgramBinding<VertexShaderPosTexTransform,
|
| - FragmentShaderTexBackgroundVaryingAlpha>
|
| - TextureBackgroundProgram;
|
| - typedef ProgramBinding<VertexShaderPosTexTransform,
|
| - FragmentShaderTexBackgroundPremultiplyAlpha>
|
| + typedef ProgramBinding<FragmentShaderBase> TextureProgram;
|
| + typedef ProgramBinding<FragmentShaderBase> NonPremultipliedTextureProgram;
|
| + typedef ProgramBinding<FragmentShaderBase> TextureBackgroundProgram;
|
| + typedef ProgramBinding<FragmentShaderBase>
|
| NonPremultipliedTextureBackgroundProgram;
|
|
|
| // 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;
|
| + typedef ProgramBinding<FragmentShaderBase> RenderPassProgram;
|
| + typedef ProgramBinding<FragmentShaderBase> RenderPassMaskProgram;
|
| + typedef ProgramBinding<FragmentShaderBase> RenderPassProgramAA;
|
| + typedef ProgramBinding<FragmentShaderBase> RenderPassMaskProgramAA;
|
| + typedef ProgramBinding<FragmentShaderBase> RenderPassColorMatrixProgram;
|
| + typedef ProgramBinding<FragmentShaderBase> RenderPassMaskColorMatrixProgramAA;
|
| + typedef ProgramBinding<FragmentShaderBase> RenderPassColorMatrixProgramAA;
|
| + typedef ProgramBinding<FragmentShaderBase> RenderPassMaskColorMatrixProgram;
|
|
|
| // Video shaders.
|
| - typedef ProgramBinding<VertexShaderVideoTransform, FragmentShaderRGBATex>
|
| - VideoStreamTextureProgram;
|
| - typedef ProgramBinding<VertexShaderPosTexYUVStretchOffset,
|
| - FragmentShaderYUVVideo> VideoYUVProgram;
|
| + typedef ProgramBinding<FragmentShaderBase> VideoStreamTextureProgram;
|
| + typedef ProgramBinding<FragmentShaderYUVVideo> VideoYUVProgram;
|
|
|
| // Special purpose / effects shaders.
|
| - typedef ProgramBinding<VertexShaderPos, FragmentShaderColor>
|
| - DebugBorderProgram;
|
| - typedef ProgramBinding<VertexShaderQuad, FragmentShaderColor>
|
| - SolidColorProgram;
|
| - typedef ProgramBinding<VertexShaderQuadAA, FragmentShaderColorAA>
|
| - SolidColorProgramAA;
|
| + typedef ProgramBinding<FragmentShaderBase> DebugBorderProgram;
|
| + typedef ProgramBinding<FragmentShaderBase> SolidColorProgram;
|
| + typedef ProgramBinding<FragmentShaderBase> SolidColorProgramAA;
|
|
|
| const TileProgram* GetTileProgram(
|
| TexCoordPrecision precision, SamplerType sampler);
|
|
|