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

Unified Diff: src/effects/SkTableColorFilter.cpp

Issue 1885863004: Refactor how we store and use samplers in Ganesh (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 8 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: src/effects/SkTableColorFilter.cpp
diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp
index 0994097e6a23a257b109d689ffaedb9d343949a8..d5674fd7a08e8bc42051734341bb62f66803951a 100644
--- a/src/effects/SkTableColorFilter.cpp
+++ b/src/effects/SkTableColorFilter.cpp
@@ -434,25 +434,26 @@ void GLColorTableEffect::emitCode(EmitArgs& args) {
}
SkString coord;
+ const GrGLSLSampler& sampler = args.fUniformHandler->getSampler(args.fTexSamplers[0]);
fragBuilder->codeAppendf("\t\t%s.a = ", args.fOutputColor);
coord.printf("vec2(coord.a, %s.a)", yoffsets);
- fragBuilder->appendTextureLookup(args.fTexSamplers[0], coord.c_str());
+ fragBuilder->appendTextureLookup(sampler, coord.c_str());
fragBuilder->codeAppend(".a;\n");
fragBuilder->codeAppendf("\t\t%s.r = ", args.fOutputColor);
coord.printf("vec2(coord.r, %s.r)", yoffsets);
- fragBuilder->appendTextureLookup(args.fTexSamplers[0], coord.c_str());
+ fragBuilder->appendTextureLookup(sampler, coord.c_str());
fragBuilder->codeAppend(".a;\n");
fragBuilder->codeAppendf("\t\t%s.g = ", args.fOutputColor);
coord.printf("vec2(coord.g, %s.g)", yoffsets);
- fragBuilder->appendTextureLookup(args.fTexSamplers[0], coord.c_str());
+ fragBuilder->appendTextureLookup(sampler, coord.c_str());
fragBuilder->codeAppend(".a;\n");
fragBuilder->codeAppendf("\t\t%s.b = ", args.fOutputColor);
coord.printf("vec2(coord.b, %s.b)", yoffsets);
- fragBuilder->appendTextureLookup(args.fTexSamplers[0], coord.c_str());
+ fragBuilder->appendTextureLookup(sampler, coord.c_str());
fragBuilder->codeAppend(".a;\n");
fragBuilder->codeAppendf("\t\t%s.rgb *= %s.a;\n", args.fOutputColor, args.fOutputColor);

Powered by Google App Engine
This is Rietveld 408576698