Index: src/core/SkPictureShader.cpp |
diff --git a/src/core/SkPictureShader.cpp b/src/core/SkPictureShader.cpp |
index 0b3c9e864bf9830b103e1839db7b4395ff1806ac..1f4d3cd948b5a00433c3b282779dab282bcf6dd4 100644 |
--- a/src/core/SkPictureShader.cpp |
+++ b/src/core/SkPictureShader.cpp |
@@ -336,27 +336,20 @@ void SkPictureShader::toString(SkString* str) const { |
#endif |
#if SK_SUPPORT_GPU |
-bool SkPictureShader::asFragmentProcessor(GrContext* context, const SkPaint& paint, |
- const SkMatrix& viewM, const SkMatrix* localMatrix, |
- GrColor* paintColor, |
- GrProcessorDataManager* procDataManager, |
- GrFragmentProcessor** fp) const { |
+const GrFragmentProcessor* SkPictureShader::asFragmentProcessor( |
+ GrContext* context, |
+ const SkMatrix& viewM, |
+ const SkMatrix* localMatrix, |
+ SkFilterQuality fq, |
+ GrProcessorDataManager* procDataManager) const { |
int maxTextureSize = 0; |
if (context) { |
maxTextureSize = context->caps()->maxTextureSize(); |
} |
SkAutoTUnref<SkShader> bitmapShader(this->refBitmapShader(viewM, localMatrix, maxTextureSize)); |
if (!bitmapShader) { |
- return false; |
+ return nullptr; |
} |
- return bitmapShader->asFragmentProcessor(context, paint, viewM, nullptr, paintColor, |
- procDataManager, fp); |
-} |
-#else |
-bool SkPictureShader::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&, |
- const SkMatrix*, GrColor*, GrProcessorDataManager*, |
- GrFragmentProcessor**) const { |
- SkDEBUGFAIL("Should not call in GPU-less build"); |
- return false; |
+ return bitmapShader->asFragmentProcessor(context, viewM, nullptr, fq, procDataManager); |
} |
#endif |