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

Unified Diff: src/effects/gradients/SkTwoPointRadialGradient.cpp

Issue 761643002: remove one place we read from gpu key in effects (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 1 month 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/gradients/SkTwoPointRadialGradient.cpp
diff --git a/src/effects/gradients/SkTwoPointRadialGradient.cpp b/src/effects/gradients/SkTwoPointRadialGradient.cpp
index 3680665830c4b6fd931246bf9f5982bfb468d27b..f4bcc2c5a386a27f349095eede205819738b40e7 100644
--- a/src/effects/gradients/SkTwoPointRadialGradient.cpp
+++ b/src/effects/gradients/SkTwoPointRadialGradient.cpp
@@ -568,14 +568,14 @@ GrGLRadial2Gradient::GrGLRadial2Gradient(const GrBackendProcessorFactory& factor
}
void GrGLRadial2Gradient::emitCode(GrGLFPBuilder* builder,
- const GrFragmentProcessor&,
+ const GrFragmentProcessor& fp,
const GrProcessorKey& key,
const char* outputColor,
const char* inputColor,
const TransformedCoordsArray& coords,
const TextureSamplerArray& samplers) {
- uint32_t baseKey = key.get32(0);
- this->emitUniforms(builder, baseKey);
+ const GrGradientEffect& ge = fp.cast<GrGradientEffect>();
+ this->emitUniforms(builder, ge);
fParamUni = builder->addUniformArray(GrGLProgramBuilder::kFragment_Visibility,
kFloat_GrSLType, "Radial2FSParams", 6);
@@ -638,7 +638,7 @@ void GrGLRadial2Gradient::emitCode(GrGLFPBuilder* builder,
t.printf("-%s / %s", cName.c_str(), bVar.c_str());
}
- this->emitColor(builder, t.c_str(), baseKey, outputColor, inputColor, samplers);
+ this->emitColor(builder, ge, t.c_str(), outputColor, inputColor, samplers);
}
void GrGLRadial2Gradient::setData(const GrGLProgramDataManager& pdman,

Powered by Google App Engine
This is Rietveld 408576698