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

Unified Diff: src/gpu/SkGpuDevice_drawTexture.cpp

Issue 1225923010: Refugee from Dead Machine 4: MDB Monster Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Last update from dead machine 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
« no previous file with comments | « src/gpu/SkGpuDevice.cpp ('k') | src/gpu/SkGr.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/SkGpuDevice_drawTexture.cpp
diff --git a/src/gpu/SkGpuDevice_drawTexture.cpp b/src/gpu/SkGpuDevice_drawTexture.cpp
index 902aae0843d35f191e76d2765f962ccfa8564d22..ff5a6872afa1a1c726a0206f329c6e3dc6aca482 100644
--- a/src/gpu/SkGpuDevice_drawTexture.cpp
+++ b/src/gpu/SkGpuDevice_drawTexture.cpp
@@ -29,7 +29,8 @@ static const GrFragmentProcessor* mix_texture_fp_with_paint_color_and_shader(
bool textureIsAlphaOnly,
GrContext* context,
const SkMatrix& viewMatrix,
- const SkPaint& paint) {
+ const SkPaint& paint,
+ GrRenderTarget* dst) {
// According to the SkCanvas API, we only consider the shader if the bitmap or image being
// rendered is alpha-only.
if (textureIsAlphaOnly) {
@@ -38,7 +39,7 @@ static const GrFragmentProcessor* mix_texture_fp_with_paint_color_and_shader(
shader->asFragmentProcessor(context,
viewMatrix,
nullptr,
- paint.getFilterQuality()));
+ paint.getFilterQuality(), dst));
if (!shaderFP) {
return nullptr;
}
@@ -157,14 +158,14 @@ void SkGpuDevice::drawTextureAdjusterImpl(GrTextureAdjuster* adjuster,
bool coordsAllInsideSrcRect = !paint.isAntiAlias() && !mf;
SkAutoTUnref<const GrFragmentProcessor> fp(adjuster->createFragmentProcessor(
- *textureFPMatrix, clippedSrcRect, constraintMode, coordsAllInsideSrcRect, filterMode));
+ *textureFPMatrix, clippedSrcRect, constraintMode, coordsAllInsideSrcRect, filterMode, fRenderTarget));
if (!fp) {
return;
}
fp.reset(mix_texture_fp_with_paint_color_and_shader(fp, alphaTexture, this->context(),
- viewMatrix, paint));
+ viewMatrix, paint, fRenderTarget));
GrPaint grPaint;
- if (!SkPaintToGrPaintReplaceShader(fContext, paint, fp, &grPaint)) {
+ if (!SkPaintToGrPaintReplaceShader(fContext, paint, fp, &grPaint, fRenderTarget)) {
return;
}
« no previous file with comments | « src/gpu/SkGpuDevice.cpp ('k') | src/gpu/SkGr.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698