aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/shaders/SkComposeShader.h
diff options
context:
space:
mode:
authorGravatar Florin Malita <fmalita@chromium.org>2017-07-12 13:31:25 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-07-12 20:36:45 +0000
commit5769dd2c9ad9443b8cf2d62748d5747e547c7ad5 (patch)
tree912ab12f89b385392d5db0da9700e40968fa69f7 /src/shaders/SkComposeShader.h
parentd4b2c537d058ad4cb890ba116d00aa86c3416c08 (diff)
Add some raster pipeline perspective asserts
I meant to add these when removing the guard, but since we landed without a guard, might as well do it now. A couple of things exposed by these asserts: 1) we need to also catch perspective in local matrices 2) we need to disallow burst mode with perspective Also tweak the predicate to hasPerspective() instead of explicit mask check. Change-Id: I099e5125fca52dccffca77c60fc800bbdf539b53 Reviewed-on: https://skia-review.googlesource.com/22483 Reviewed-by: Mike Reed <reed@google.com> Reviewed-by: Mike Klein <mtklein@google.com> Reviewed-by: Herb Derby <herb@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'src/shaders/SkComposeShader.h')
-rw-r--r--src/shaders/SkComposeShader.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shaders/SkComposeShader.h b/src/shaders/SkComposeShader.h
index a3b5b21db8..432915dfba 100644
--- a/src/shaders/SkComposeShader.h
+++ b/src/shaders/SkComposeShader.h
@@ -11,7 +11,7 @@
#include "SkShaderBase.h"
#include "SkBlendMode.h"
-class SkComposeShader : public SkShaderBase {
+class SkComposeShader final : public SkShaderBase {
public:
SkComposeShader(sk_sp<SkShader> dst, sk_sp<SkShader> src, SkBlendMode mode, float lerpT)
: fDst(std::move(dst))
@@ -45,7 +45,7 @@ protected:
bool onAppendStages(SkRasterPipeline*, SkColorSpace* dstCS, SkArenaAlloc*,
const SkMatrix&, const SkPaint&, const SkMatrix* localM) const override;
- bool isRasterPipelineOnly() const final { return true; }
+ bool onIsRasterPipelineOnly() const override { return true; }
private:
sk_sp<SkShader> fDst;