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

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: resolved conflicts with TOT 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
« no previous file with comments | « cc/layers/video_layer_impl.cc ('k') | 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 97ef0b0027997686da06d4616d3ca1bd9f3e6f27..5ce21ca10453f58967d9a6c9bbff105d2b663332 100644
--- a/cc/output/gl_renderer.h
+++ b/cc/output/gl_renderer.h
@@ -260,6 +260,12 @@ class CC_EXPORT GLRenderer : public DirectRenderer {
FragmentShaderRGBATexPremultiplyAlpha>
NonPremultipliedTextureProgram;
typedef ProgramBinding<VertexShaderPosTexTransform,
+ FragmentShaderTexBackgroundVaryingAlpha>
+ TextureBackgroundProgram;
+ typedef ProgramBinding<VertexShaderPosTexTransform,
+ FragmentShaderTexBackgroundVaryingAlpha>
+ NonPremultipliedTextureBackgroundProgram;
+ typedef ProgramBinding<VertexShaderPosTexTransform,
FragmentShaderRGBATexRectVaryingAlpha>
TextureIOSurfaceProgram;
@@ -334,6 +340,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);
@@ -365,11 +375,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_;
« no previous file with comments | « cc/layers/video_layer_impl.cc ('k') | cc/output/gl_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698