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

Unified Diff: cc/output/shader.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/output/renderer_pixeltest.cc ('k') | cc/output/shader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/shader.h
diff --git a/cc/output/shader.h b/cc/output/shader.h
index 1037a83a3b31b80be45e9df7941ade9c2ec4df33..7135befd3899f913c319d70544f8bb1640b32a2c 100644
--- a/cc/output/shader.h
+++ b/cc/output/shader.h
@@ -326,6 +326,7 @@ class FragmentTexOpaqueBinding {
int* base_uniform_index);
int alpha_location() const { return -1; }
int fragment_tex_transform_location() const { return -1; }
+ int background_color_location() const { return -1; }
int sampler_location() const { return sampler_location_; }
private:
@@ -334,6 +335,24 @@ class FragmentTexOpaqueBinding {
DISALLOW_COPY_AND_ASSIGN(FragmentTexOpaqueBinding);
};
+class FragmentTexBackgroundBinding {
+ public:
+ FragmentTexBackgroundBinding();
+
+ void Init(WebKit::WebGraphicsContext3D* context,
+ unsigned program,
+ bool using_bind_uniform,
+ int* base_uniform_index);
+ int background_color_location() const { return background_color_location_; }
+ int sampler_location() const { return sampler_location_; }
+
+ private:
+ int background_color_location_;
+ int sampler_location_;
+
+ DISALLOW_COPY_AND_ASSIGN(FragmentTexBackgroundBinding);
+};
+
class FragmentShaderRGBATexVaryingAlpha : public FragmentTexOpaqueBinding {
public:
std::string GetShaderString(TexCoordPrecision precision) const;
@@ -344,6 +363,18 @@ class FragmentShaderRGBATexPremultiplyAlpha : public FragmentTexOpaqueBinding {
std::string GetShaderString(TexCoordPrecision precision) const;
};
+class FragmentShaderTexBackgroundVaryingAlpha
+ : public FragmentTexBackgroundBinding {
+ public:
+ std::string GetShaderString(TexCoordPrecision precision) const;
+};
+
+class FragmentShaderTexBackgroundPremultiplyAlpha
+ : public FragmentTexBackgroundBinding {
+ public:
+ std::string GetShaderString(TexCoordPrecision precision) const;
+};
+
class FragmentShaderRGBATexAlpha : public FragmentTexAlphaBinding {
public:
std::string GetShaderString(TexCoordPrecision precision) const;
@@ -355,7 +386,7 @@ class FragmentShaderRGBATexColorMatrixAlpha
std::string GetShaderString(TexCoordPrecision precision) const;
};
-class FragmentShaderRGBATexRectVaryingAlpha : public FragmentTexAlphaBinding {
+class FragmentShaderRGBATexRectVaryingAlpha : public FragmentTexOpaqueBinding {
public:
std::string GetShaderString(TexCoordPrecision precision) const;
};
« no previous file with comments | « cc/output/renderer_pixeltest.cc ('k') | cc/output/shader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698