aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkShader.cpp
diff options
context:
space:
mode:
authorGravatar joshualitt <joshualitt@chromium.org>2014-12-17 15:50:11 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2014-12-17 15:50:11 -0800
commit5531d51ce7426bdae7563547326fcf0bf926a083 (patch)
tree111625235b55e016756b32d9904d6d3bf059c73c /src/core/SkShader.cpp
parent1b28a3a4890e3b84b43181b3fe3690ac565930dc (diff)
remove view matrix from context
Diffstat (limited to 'src/core/SkShader.cpp')
-rw-r--r--src/core/SkShader.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/core/SkShader.cpp b/src/core/SkShader.cpp
index 65caf7b0fc..f146345f9a 100644
--- a/src/core/SkShader.cpp
+++ b/src/core/SkShader.cpp
@@ -214,8 +214,8 @@ SkShader::GradientType SkShader::asAGradient(GradientInfo* info) const {
return kNone_GradientType;
}
-bool SkShader::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix*, GrColor*,
- GrFragmentProcessor**) const {
+bool SkShader::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&, const SkMatrix*,
+ GrColor*, GrFragmentProcessor**) const {
return false;
}
@@ -345,8 +345,9 @@ SkShader::GradientType SkColorShader::asAGradient(GradientInfo* info) const {
#include "SkGr.h"
-bool SkColorShader::asFragmentProcessor(GrContext*, const SkPaint& paint, const SkMatrix*,
- GrColor* paintColor, GrFragmentProcessor** fp) const {
+bool SkColorShader::asFragmentProcessor(GrContext*, const SkPaint& paint, const SkMatrix&,
+ const SkMatrix*, GrColor* paintColor,
+ GrFragmentProcessor** fp) const {
*fp = NULL;
SkColor skColor = fColor;
U8CPU newA = SkMulDiv255Round(SkColorGetA(fColor), paint.getAlpha());
@@ -356,7 +357,8 @@ bool SkColorShader::asFragmentProcessor(GrContext*, const SkPaint& paint, const
#else
-bool SkColorShader::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix*, GrColor*,
+bool SkColorShader::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&,
+ const SkMatrix*, GrColor*,
GrFragmentProcessor**) const {
SkDEBUGFAIL("Should not call in GPU-less build");
return false;