aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/shaders/SkShader.cpp
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2017-08-08 16:29:22 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-08-08 21:32:42 +0000
commit3404207e2418e791231e36d2848e9137d6c73cad (patch)
tree23a56e88ce668387eea71137f96b2dd56c6aff36 /src/shaders/SkShader.cpp
parent4d011bef0adb7f7bf52e96364a02b2af1312255b (diff)
use rasterpipeline for images if matrix is >= scale+translate
Bug: skia: Change-Id: I36112fe54c6f2d0965d0b88f0291d7ffe0902715 Reviewed-on: https://skia-review.googlesource.com/30480 Commit-Queue: Mike Reed <reed@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org> Reviewed-by: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'src/shaders/SkShader.cpp')
-rw-r--r--src/shaders/SkShader.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/shaders/SkShader.cpp b/src/shaders/SkShader.cpp
index cc0d6b19d5..5540b2d95f 100644
--- a/src/shaders/SkShader.cpp
+++ b/src/shaders/SkShader.cpp
@@ -91,8 +91,6 @@ bool SkShaderBase::asLuminanceColor(SkColor* colorPtr) const {
}
SkShaderBase::Context* SkShaderBase::makeContext(const ContextRec& rec, SkArenaAlloc* alloc) const {
- SkASSERT(!this->isRasterPipelineOnly());
-
return this->computeTotalInverse(*rec.fMatrix, rec.fLocalMatrix, nullptr)
? this->onMakeContext(rec, alloc)
: nullptr;
@@ -117,7 +115,7 @@ SkShaderBase::Context::Context(const SkShaderBase& shader, const ContextRec& rec
: fShader(shader), fCTM(*rec.fMatrix)
{
// We should never use a context for RP-only shaders.
- SkASSERT(!shader.isRasterPipelineOnly());
+ SkASSERT(!shader.isRasterPipelineOnly(*rec.fMatrix));
// ... or for perspective.
SkASSERT(!rec.fMatrix->hasPerspective());
SkASSERT(!rec.fLocalMatrix || !rec.fLocalMatrix->hasPerspective());