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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/gpu/SkGpuDevice.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index c9cda0de7d..f031e5edf1 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -369,7 +369,7 @@ void SkGpuDevice::drawPoints(SkCanvas::PointMode mode, nullptr); fRenderTargetContext->drawVertices(this->clip(), std::move(grPaint), *viewMatrix, - std::move(vertices), nullptr, 0, &primitiveType); + std::move(vertices), &primitiveType); } /////////////////////////////////////////////////////////////////////////////// @@ -1486,9 +1486,7 @@ static bool init_vertices_paint(GrContext* context, const GrColorSpaceInfo& colo } void SkGpuDevice::wireframeVertices(SkVertices::VertexMode vmode, int vertexCount, - const SkPoint vertices[], - const SkMatrix bones[], int boneCount, - SkBlendMode bmode, + const SkPoint vertices[], SkBlendMode bmode, const uint16_t indices[], int indexCount, const SkPaint& paint) { ASSERT_SINGLE_OWNER @@ -1546,13 +1544,12 @@ void SkGpuDevice::wireframeVertices(SkVertices::VertexMode vmode, int vertexCoun std::move(grPaint), this->ctm(), builder.detach(), - bones, - boneCount, &primitiveType); } -void SkGpuDevice::drawVertices(const SkVertices* vertices, const SkMatrix bones[], int boneCount, +void SkGpuDevice::drawVertices(const SkVertices* vertices, const SkMatrix* bones, int boneCount, SkBlendMode mode, const SkPaint& paint) { + // TODO: GPU ANIMATION ASSERT_SINGLE_OWNER GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice", "drawVertices", fContext.get()); @@ -1563,8 +1560,7 @@ void SkGpuDevice::drawVertices(const SkVertices* vertices, const SkMatrix bones[ if ((!hasTexs || !paint.getShader()) && !hasColors) { // The dreaded wireframe mode. Fallback to drawVertices and go so slooooooow. this->wireframeVertices(vertices->mode(), vertices->vertexCount(), vertices->positions(), - bones, boneCount, mode, vertices->indices(), vertices->indexCount(), - paint); + mode, vertices->indices(), vertices->indexCount(), paint); return; } if (!init_vertices_paint(fContext.get(), fRenderTargetContext->colorSpaceInfo(), paint, @@ -1572,8 +1568,7 @@ void SkGpuDevice::drawVertices(const SkVertices* vertices, const SkMatrix bones[ return; } fRenderTargetContext->drawVertices(this->clip(), std::move(grPaint), this->ctm(), - sk_ref_sp(const_cast<SkVertices*>(vertices)), - bones, boneCount); + sk_ref_sp(const_cast<SkVertices*>(vertices))); } /////////////////////////////////////////////////////////////////////////////// |