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

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: Created 7 years, 6 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 d0b509a187e3f4cd6feefbf62bac1ac2e6e467c9..839ec9e5cd0cdccc520cf934bbe32c19cbb4dc49 100644
--- a/cc/output/gl_renderer.h
+++ b/cc/output/gl_renderer.h
@@ -254,9 +254,9 @@ class CC_EXPORT GLRenderer : public DirectRenderer {
// Texture shaders.
typedef ProgramBinding<VertexShaderPosTexTransform,
- FragmentShaderRGBATexVaryingAlpha> TextureProgram;
+ FragmentShaderTexture> TextureProgram;
typedef ProgramBinding<VertexShaderPosTexTransform,
- FragmentShaderRGBATexPremultiplyAlpha>
+ FragmentShaderNonPremulTexture>
NonPremultipliedTextureProgram;
typedef ProgramBinding<VertexShaderPosTexTransform,
FragmentShaderRGBATexRectVaryingAlpha>

Powered by Google App Engine
This is Rietveld 408576698