From c05aa7d163fd0b930fa450d2e4c7f2497f036254 Mon Sep 17 00:00:00 2001 From: Ruiqi Mao Date: Tue, 3 Jul 2018 21:18:07 +0000 Subject: Revert "added skeletal animation support to GPU backend" This reverts commit b6307340e8a6a9d3a7517def7f5eaaadffd07d14. Reason for revert: patch/atlas failing in gold Original change's description: > added skeletal animation support to GPU backend > > added caching of SkVertices > > Docs-Preview: https://skia.org/?cl=138596 > Bug: skia: > Change-Id: Ia750f55f5f6d0de250d9e9c5619f4d1ac856f9f5 > Reviewed-on: https://skia-review.googlesource.com/138596 > Reviewed-by: Brian Osman > Reviewed-by: Robert Phillips > Commit-Queue: Ruiqi Mao TBR=robertphillips@google.com,brianosman@google.com,reed@google.com,ruiqimao@google.com Change-Id: Idfaf016a7ff4cdd8af2543d510706f489d04417a No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/139281 Reviewed-by: Ruiqi Mao Commit-Queue: Ruiqi Mao --- src/gpu/GrDefaultGeoProcFactory.h | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'src/gpu/GrDefaultGeoProcFactory.h') diff --git a/src/gpu/GrDefaultGeoProcFactory.h b/src/gpu/GrDefaultGeoProcFactory.h index c22cefbd73..314c1bb963 100644 --- a/src/gpu/GrDefaultGeoProcFactory.h +++ b/src/gpu/GrDefaultGeoProcFactory.h @@ -54,7 +54,7 @@ namespace GrDefaultGeoProcFactory { SkPoint fLocalCoord; }; - struct PositionColorLocalCoordCoverageAttr { + struct PositionColorLocalCoordCoverage { SkPoint fPosition; GrColor fColor; SkPoint fLocalCoord; @@ -118,15 +118,6 @@ namespace GrDefaultGeoProcFactory { const SkMatrix* fMatrix; }; - struct Bones { - Bones(const SkMatrix bones[], int boneCount) - : fBones(bones) - , fBoneCount(boneCount) {} - - const SkMatrix* fBones; - int fBoneCount; - }; - sk_sp Make(const Color&, const Coverage&, const LocalCoords&, @@ -141,17 +132,6 @@ namespace GrDefaultGeoProcFactory { const Coverage&, const LocalCoords&, const SkMatrix& viewMatrix); - - /* - * Use this factory to create a GrGeometryProcessor that supports skeletal animation through - * deformation of vertices using matrices that are passed in. This should only be called from - * GrDrawVerticesOp. - */ - sk_sp MakeWithBones(const Color&, - const Coverage&, - const LocalCoords&, - const Bones&, - const SkMatrix& viewMatrix); }; #endif -- cgit v1.2.3