aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrDefaultGeoProcFactory.h
diff options
context:
space:
mode:
authorGravatar Ruiqi Mao <ruiqimao@google.com>2018-07-03 21:18:07 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-07-03 21:18:18 +0000
commitc05aa7d163fd0b930fa450d2e4c7f2497f036254 (patch)
treed741730ca4b88ade1f73f4f2c20dec0ad1789464 /src/gpu/GrDefaultGeoProcFactory.h
parent5ffcb4d20e3f9798daa013f2b4d00bfb4a9a01da (diff)
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 <brianosman@google.com> > Reviewed-by: Robert Phillips <robertphillips@google.com> > Commit-Queue: Ruiqi Mao <ruiqimao@google.com> 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 <ruiqimao@google.com> Commit-Queue: Ruiqi Mao <ruiqimao@google.com>
Diffstat (limited to 'src/gpu/GrDefaultGeoProcFactory.h')
-rw-r--r--src/gpu/GrDefaultGeoProcFactory.h22
1 files changed, 1 insertions, 21 deletions
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<GrGeometryProcessor> 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<GrGeometryProcessor> MakeWithBones(const Color&,
- const Coverage&,
- const LocalCoords&,
- const Bones&,
- const SkMatrix& viewMatrix);
};
#endif