diff options
| author |  Joe Gregorio <jcgregorio@google.com> | 2018-07-10 20:35:19 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-10 20:35:26 +0000 |
| commit | 383c9bbf0fca577d9efd86ce6ccb28c1c39c6e34 (patch) | |
| tree | 306fb53aa4402d73345775db12facf39b7bedbcd /src/gpu/SkGpuDevice.h | |
| parent | 1b112cc5604d294427c0d51f194ab7fb3067d9e2 (diff) | |
Revert "added skeletal animation support to GPU backend"
This reverts commit d275ef501c8e6ea6444912e22c29e2d13a3dfb53.
Reason for revert: Failing to compile on debian9.
Original change's description:
> added skeletal animation support to GPU backend
>
> Pulled from reverted CL: https://skia-review.googlesource.com/c/skia/+/138596
>
> Bug: skia:
> Change-Id: Ie07f1c76bae65c219ebe93d071bb19f1a30100c2
> Reviewed-on: https://skia-review.googlesource.com/139282
> Reviewed-by: Brian Osman <brianosman@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> Commit-Queue: Ruiqi Mao <ruiqimao@google.com>
TBR=robertphillips@google.com,brianosman@google.com,ruiqimao@google.com
Change-Id: Ibc0da6ce16f078ff74a2c1bcab30750baff460f7
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/140381
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
Diffstat (limited to 'src/gpu/SkGpuDevice.h')
| -rw-r--r-- | src/gpu/SkGpuDevice.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gpu/SkGpuDevice.h b/src/gpu/SkGpuDevice.h index c31e6245b3..48ba8ac8a1 100644 --- a/src/gpu/SkGpuDevice.h +++ b/src/gpu/SkGpuDevice.h @@ -91,7 +91,7 @@ public: int scalarsPerPos, const SkPoint& offset, const SkPaint&) override; void drawTextBlob(const SkTextBlob*, SkScalar x, SkScalar y, const SkPaint& paint, SkDrawFilter* drawFilter) override; - void drawVertices(const SkVertices*, const SkMatrix bones[], int boneCount, SkBlendMode, + void drawVertices(const SkVertices*, const SkMatrix* bones, int boneCount, SkBlendMode, const SkPaint&) override; void drawShadow(const SkPath&, const SkDrawShadowRec&) override; void drawAtlas(const SkImage* atlas, const SkRSXform[], const SkRect[], @@ -248,8 +248,7 @@ private: void drawStrokedLine(const SkPoint pts[2], const SkPaint&); void wireframeVertices(SkVertices::VertexMode, int vertexCount, const SkPoint verts[], - const SkMatrix bones[], int boneCount, SkBlendMode, - const uint16_t indices[], int indexCount, const SkPaint&); + SkBlendMode, const uint16_t indices[], int indexCount, const SkPaint&); static sk_sp<GrRenderTargetContext> MakeRenderTargetContext(GrContext*, SkBudgeted, |