diff options
| author |  Robert Phillips <robertphillips@google.com> | 2018-04-11 12:38:41 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-11 12:38:47 +0000 |
| commit | c64ee20e135a336ed775ccb6dec8a87efd19ec02 (patch) | |
| tree | 661c8d0d3ee64ff31b45548758e3c1dfe4abc81d /src/shaders/SkShaderBase.h | |
| parent | 90f09e7853f506808b7dad5c50b60376887277a4 (diff) | |
Revert "Fix handling of MaskFilter matrices"
This reverts commit 2097fd03ffea48bd904c48c93348b2350600870e.
Reason for revert: This is breaking a lot of Windows bots (esp. on the shadermaskfilter_localmatrix)
Original change's description:
> Fix handling of MaskFilter matrices
>
> 1) extend GrFPArgs to track pre/post local matrices, add helpers for
> creating pre/post wrapper args
>
> 2) add a SkShaderBase helper (totalLocalMatrix) to centralize the LM
> sandwich logic.
>
> 3) update call sites to use the above
>
> 4) rename SkMatrixFilter::makeWithLocalMatrix -> makeWithMatrix, to
> disambiguate vs. SkShader::makeWithLocalMatrix.
>
> BUG=skia:7744
>
> Change-Id: Ib2b7b007e6924979b00649dde7c94ef4b34771f1
> Reviewed-on: https://skia-review.googlesource.com/119330
> Commit-Queue: Florin Malita <fmalita@chromium.org>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
TBR=bsalomon@google.com,robertphillips@google.com,fmalita@chromium.org,reed@google.com
Change-Id: I918dbb95bf00b3122e6699b84566ec82dbb5fc5c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7744
Reviewed-on: https://skia-review.googlesource.com/120340
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/shaders/SkShaderBase.h')
| -rw-r--r-- | src/shaders/SkShaderBase.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/shaders/SkShaderBase.h b/src/shaders/SkShaderBase.h index cddc5540ee..89674a6ebb 100644 --- a/src/shaders/SkShaderBase.h +++ b/src/shaders/SkShaderBase.h @@ -12,7 +12,6 @@ #include "SkMask.h" #include "SkMatrix.h" #include "SkShader.h" -#include "SkTLazy.h" #if SK_SUPPORT_GPU #include "GrFPArgs.h" @@ -186,16 +185,9 @@ public: // If this returns false, then we draw nothing (do not fall back to shader context) bool appendStages(const StageRec&) const; - bool SK_WARN_UNUSED_RESULT computeTotalInverse(const SkMatrix& ctm, - const SkMatrix* outerLocalMatrix, - SkMatrix* totalInverse) const; - - // Returns the total local matrix for this shader: - // - // M = postLocalMatrix x shaderLocalMatrix x preLocalMatrix - // - SkTCopyOnFirstWrite<SkMatrix> totalLocalMatrix(const SkMatrix* preLocalMatrix, - const SkMatrix* postLocalMatrix = nullptr) const; + bool computeTotalInverse(const SkMatrix& ctm, + const SkMatrix* outerLocalMatrix, + SkMatrix* totalInverse) const; #ifdef SK_SUPPORT_LEGACY_SHADER_ISABITMAP virtual bool onIsABitmap(SkBitmap*, SkMatrix*, TileMode[2]) const { |