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

Unified Diff: cc/output/gl_renderer.h

Issue 18432002: Blend TextureLayer background-color at draw time. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: minor cleanup Created 7 years, 5 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
Index: cc/output/gl_renderer.h
diff --git a/cc/output/gl_renderer.h b/cc/output/gl_renderer.h
index 03b7dbc4e7b82bd5c4caae167463be783183d83f..f218dd782bd8c50664d5586e50b213fdfa296ed1 100644
--- a/cc/output/gl_renderer.h
+++ b/cc/output/gl_renderer.h
@@ -259,6 +259,12 @@ class CC_EXPORT GLRenderer : public DirectRenderer {
FragmentShaderRGBATexPremultiplyAlpha>
NonPremultipliedTextureProgram;
typedef ProgramBinding<VertexShaderPosTexTransform,
+ FragmentShaderTexBackgroundVaryingAlpha>
+ TextureBackgroundProgram;
+ typedef ProgramBinding<VertexShaderPosTexTransform,
+ FragmentShaderTexBackgroundVaryingAlpha>
+ NonPremultipliedTextureBackgroundProgram;
+ typedef ProgramBinding<VertexShaderPosTexTransform,
FragmentShaderRGBATexRectVaryingAlpha>
TextureIOSurfaceProgram;
@@ -333,6 +339,10 @@ class CC_EXPORT GLRenderer : public DirectRenderer {
TexCoordPrecision precision);
const NonPremultipliedTextureProgram* GetNonPremultipliedTextureProgram(
TexCoordPrecision precision);
+ const TextureBackgroundProgram* GetTextureBackgroundProgram(
+ TexCoordPrecision precision);
+ const NonPremultipliedTextureBackgroundProgram*
+ GetNonPremultipliedTextureBackgroundProgram(TexCoordPrecision precision);
const TextureIOSurfaceProgram* GetTextureIOSurfaceProgram(
TexCoordPrecision precision);
@@ -364,11 +374,17 @@ class CC_EXPORT GLRenderer : public DirectRenderer {
scoped_ptr<TextureProgram> texture_program_;
scoped_ptr<NonPremultipliedTextureProgram> nonpremultiplied_texture_program_;
+ scoped_ptr<TextureBackgroundProgram> texture_background_program_;
+ scoped_ptr<NonPremultipliedTextureBackgroundProgram>
+ nonpremultiplied_texture_background_program_;
scoped_ptr<TextureIOSurfaceProgram> texture_io_surface_program_;
scoped_ptr<TextureProgram> texture_program_highp_;
scoped_ptr<NonPremultipliedTextureProgram>
nonpremultiplied_texture_program_highp_;
+ scoped_ptr<TextureBackgroundProgram> texture_background_program_highp_;
+ scoped_ptr<NonPremultipliedTextureBackgroundProgram>
+ nonpremultiplied_texture_background_program_highp_;
scoped_ptr<TextureIOSurfaceProgram> texture_io_surface_program_highp_;
scoped_ptr<RenderPassProgram> render_pass_program_;

Powered by Google App Engine
This is Rietveld 408576698