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

Unified Diff: cc/output/gl_renderer.h

Issue 2612823003: The great shader refactor: Delete all of the subclasses (Closed)
Patch Set: The great shader refactor: Delete all of the subclasses Created 3 years, 11 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 | « no previous file | 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 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);
« no previous file with comments | « no previous file | cc/output/gl_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698