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

Unified Diff: src/core/SkBitmapProcShader.cpp

Issue 808703006: remove view matrix from context (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: cleanups Created 6 years 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/core/SkBitmapProcShader.cpp
diff --git a/src/core/SkBitmapProcShader.cpp b/src/core/SkBitmapProcShader.cpp
index 2cfde655b8792791f150a78b210e071524a7f065..4ad3a134bad145f0f718807cb82f74f533d2237a 100644
--- a/src/core/SkBitmapProcShader.cpp
+++ b/src/core/SkBitmapProcShader.cpp
@@ -367,6 +367,7 @@ void SkBitmapProcShader::toString(SkString* str) const {
#include "SkGr.h"
bool SkBitmapProcShader::asFragmentProcessor(GrContext* context, const SkPaint& paint,
+ const SkMatrix& viewM,
const SkMatrix* localMatrix, GrColor* paintColor,
GrFragmentProcessor** fp) const {
SkMatrix matrix;
@@ -405,7 +406,7 @@ bool SkBitmapProcShader::asFragmentProcessor(GrContext* context, const SkPaint&
break;
case SkPaint::kMedium_FilterLevel: {
SkMatrix matrix;
- matrix.setConcat(context->getMatrix(), this->getLocalMatrix());
+ matrix.setConcat(viewM, this->getLocalMatrix());
if (matrix.getMinScale() < SK_Scalar1) {
textureFilterMode = GrTextureParams::kMipMap_FilterMode;
} else {
@@ -416,7 +417,7 @@ bool SkBitmapProcShader::asFragmentProcessor(GrContext* context, const SkPaint&
}
case SkPaint::kHigh_FilterLevel: {
SkMatrix matrix;
- matrix.setConcat(context->getMatrix(), this->getLocalMatrix());
+ matrix.setConcat(viewM, this->getLocalMatrix());
useBicubic = GrBicubicEffect::ShouldUseBicubic(matrix, &textureFilterMode);
break;
}

Powered by Google App Engine
This is Rietveld 408576698