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

Unified Diff: cc/output/shader.cc

Issue 812543002: Update from https://crrev.com/308331 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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/software_renderer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/shader.cc
diff --git a/cc/output/shader.cc b/cc/output/shader.cc
index e22e4464a515974d4744722ab65c9a5e6d1e4c03..5bc704497ca5b63c24547ac5d9ea15092783b454 100644
--- a/cc/output/shader.cc
+++ b/cc/output/shader.cc
@@ -695,14 +695,14 @@ std::string FragmentTexBlendMode::SetBlendModeFunctions(
// clang-format off
static const std::string kFunctionApplyBlendMode = SHADER0(
// clang-format on
- uniform SamplerType s_backdropTexture;
+ uniform sampler2D s_backdropTexture;
uniform TexCoordPrecision vec4 backdropRect;
vec4 GetBackdropColor() {
TexCoordPrecision vec2 bgTexCoord = gl_FragCoord.xy - backdropRect.xy;
bgTexCoord.x /= backdropRect.z;
bgTexCoord.y /= backdropRect.w;
- return TextureLookup(s_backdropTexture, bgTexCoord);
+ return texture2D(s_backdropTexture, bgTexCoord);
}
vec4 ApplyBlendMode(vec4 src) {
« no previous file with comments | « cc/output/renderer_pixeltest.cc ('k') | cc/output/software_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698