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

Unified Diff: src/core/SkLocalMatrixShader.h

Issue 1316513002: Change SkShader;asFragmentProcessor signature to no longer take skpaint\grcolor* (Closed) Base URL: https://skia.googlesource.com/skia.git@things
Patch Set: Address comments, fix roll(?) Created 5 years, 4 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 | « src/core/SkLightingShader.cpp ('k') | src/core/SkPictureShader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkLocalMatrixShader.h
diff --git a/src/core/SkLocalMatrixShader.h b/src/core/SkLocalMatrixShader.h
index a145432a160b6a3654171c343d5f32015873f884..9c6a526f7b1356511be2373b79c336ff8a6f58f0 100644
--- a/src/core/SkLocalMatrixShader.h
+++ b/src/core/SkLocalMatrixShader.h
@@ -33,28 +33,15 @@ public:
}
#if SK_SUPPORT_GPU
-
- virtual bool asFragmentProcessor(GrContext* context, const SkPaint& paint,
- const SkMatrix& viewM, const SkMatrix* localMatrix,
- GrColor* grColor, GrProcessorDataManager* procDataManager,
- GrFragmentProcessor** fp) const override {
+ const GrFragmentProcessor* asFragmentProcessor(GrContext* context, const SkMatrix& viewM,
+ const SkMatrix* localMatrix, SkFilterQuality fq,
+ GrProcessorDataManager* procDataManager) const override {
SkMatrix tmp = this->getLocalMatrix();
if (localMatrix) {
tmp.preConcat(*localMatrix);
}
- return fProxyShader->asFragmentProcessor(context, paint, viewM, &tmp, grColor,
- procDataManager, fp);
+ return fProxyShader->asFragmentProcessor(context, viewM, &tmp, fq, procDataManager);
}
-
-#else
-
- virtual bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&,
- const SkMatrix*, GrColor*, GrProcessorDataManager*,
- GrFragmentProcessor**) const override {
- SkDEBUGFAIL("Should not call in GPU-less build");
- return false;
- }
-
#endif
SkShader* refAsALocalMatrixShader(SkMatrix* localMatrix) const override {
« no previous file with comments | « src/core/SkLightingShader.cpp ('k') | src/core/SkPictureShader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698