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 --- site/user/api/SkCanvas_Reference.md | 10 ++++------ site/user/api/SkIRect_Reference.md | 4 ++-- site/user/api/SkImageInfo_Reference.md | 2 +- site/user/api/SkImage_Reference.md | 2 +- site/user/api/SkMatrix_Reference.md | 2 +- site/user/api/SkPaint_Reference.md | 4 ++-- site/user/api/SkPath_Reference.md | 4 ++-- site/user/api/SkPixmap_Reference.md | 4 ++-- site/user/api/SkPoint_Reference.md | 2 +- site/user/api/SkRRect_Reference.md | 6 +++--- site/user/api/SkRect_Reference.md | 2 +- site/user/api/SkSurface_Reference.md | 2 +- site/user/api/catalog.htm | 4 ++-- 13 files changed, 23 insertions(+), 25 deletions(-) (limited to 'site') diff --git a/site/user/api/SkCanvas_Reference.md b/site/user/api/SkCanvas_Reference.md index 7d8714530d..1656128411 100644 --- a/site/user/api/SkCanvas_Reference.md +++ b/site/user/api/SkCanvas_Reference.md @@ -2684,7 +2684,7 @@ the result with Matrix. ### Example -
scale followed by translate produces different results from translate followed +
scale followed by translate produces different results from translate followed by scale. The blue stroke follows translate of (50, 50); a black @@ -4662,7 +4662,7 @@ and so on; or nullptr ### Example -
+
### See Also @@ -6412,7 +6412,7 @@ void drawPicture(const Shader, bones should be an object to world space transformation matrix that will be applied before performing mesh deformations. If no such transformation is needed, it should be the identity matrix. -boneCount must be at most 100, and thus the size of bones should be at most 100. ### Parameters @@ -6582,7 +6581,6 @@ contains Shader, bones should be an object to world space transformation matrix that will be applied before performing mesh deformations. If no such transformation is needed, it should be the identity matrix. -boneCount must be at most 100, and thus the size of bones should be at most 100. ### Parameters @@ -6775,7 +6773,7 @@ If cullRect is outside of dy is positive, IRect +
#### Example Output @@ -2277,7 +2277,7 @@ true if a and width and
+
### See Also diff --git a/site/user/api/SkImage_Reference.md b/site/user/api/SkImage_Reference.md index eec6966d98..3c883961c5 100644 --- a/site/user/api/SkImage_Reference.md +++ b/site/user/api/SkImage_Reference.md @@ -2300,7 +2300,7 @@ partial or full Image, or nullptr ### Example -
+
### See Also diff --git a/site/user/api/SkMatrix_Reference.md b/site/user/api/SkMatrix_Reference.md index 4c891add50..dad2ae9670 100644 --- a/site/user/api/SkMatrix_Reference.md +++ b/site/user/api/SkMatrix_Reference.md @@ -3203,7 +3203,7 @@ Matrix * S(sx, sy) = | D E F | | 0 sy 0 | = | D*sx E*sy F | ### Example -
+
### See Also diff --git a/site/user/api/SkPaint_Reference.md b/site/user/api/SkPaint_Reference.md index 06b6eb4335..3a5a9320b0 100644 --- a/site/user/api/SkPaint_Reference.md +++ b/site/user/api/SkPaint_Reference.md @@ -2609,7 +2609,7 @@ Sets Alpha and RGB used when stroking and ### Example -
+
#### Example Output @@ -4477,7 +4477,7 @@ typographic height of text ### Example -
+
--- diff --git a/site/user/api/SkPath_Reference.md b/site/user/api/SkPath_Reference.md index 51210da825..db49eed115 100644 --- a/site/user/api/SkPath_Reference.md +++ b/site/user/api/SkPath_Reference.md @@ -5570,7 +5570,7 @@ The format used for Path in memory is not guaranteed. ### Example -
+
#### Example Output @@ -5753,7 +5753,7 @@ degenerate data. ### Example -
Ignoring the actual Verbs and replacing them with Quads rounds the +
Ignoring the actual Verbs and replacing them with Quads rounds the path of the glyph.
diff --git a/site/user/api/SkPixmap_Reference.md b/site/user/api/SkPixmap_Reference.md index 4a5ba1f941..e9472a9ea7 100644 --- a/site/user/api/SkPixmap_Reference.md +++ b/site/user/api/SkPixmap_Reference.md @@ -492,7 +492,7 @@ reference to ImageInfo ### Example -
+
#### Example Output @@ -1109,7 +1109,7 @@ readable unsigned 8-bit pointer to pixels ### Example -
+
#### Example Output diff --git a/site/user/api/SkPoint_Reference.md b/site/user/api/SkPoint_Reference.md index e35801822d..8c3b36ad79 100644 --- a/site/user/api/SkPoint_Reference.md +++ b/site/user/api/SkPoint_Reference.md @@ -1207,7 +1207,7 @@ Returns Point multiplied by scale. ### Example -
+
### See Also diff --git a/site/user/api/SkRRect_Reference.md b/site/user/api/SkRRect_Reference.md index c2f16d38ab..3c4decfbba 100644 --- a/site/user/api/SkRRect_Reference.md +++ b/site/user/api/SkRRect_Reference.md @@ -626,7 +626,7 @@ true if has identical geometry to Oval ### Example -
The first radii are scaled down proportionately until both x-axis and y-axis fit +
The first radii are scaled down proportionately until both x-axis and y-axis fit within the bounds. After scaling, x-axis radius is smaller than half the width; left round rect is not an oval. The second radii are equal to half the dimensions; right round rect is an oval. @@ -1042,7 +1042,7 @@ Otherwise, sets to kSimple Type. ### Example -
+
### See Also @@ -1292,7 +1292,7 @@ bounding box ### Example -
+
### See Also diff --git a/site/user/api/SkRect_Reference.md b/site/user/api/SkRect_Reference.md index e0402bf2f6..e9e55d52bc 100644 --- a/site/user/api/SkRect_Reference.md +++ b/site/user/api/SkRect_Reference.md @@ -1171,7 +1171,7 @@ and sort to reverse fTop a ### Example -
+
#### Example Output diff --git a/site/user/api/SkSurface_Reference.md b/site/user/api/SkSurface_Reference.md index 387c6cbae6..2b66e0e088 100644 --- a/site/user/api/SkSurface_Reference.md +++ b/site/user/api/SkSurface_Reference.md @@ -1014,7 +1014,7 @@ has no effect. Calling makeImageSnapshot< ### Example -
+
#### Example Output diff --git a/site/user/api/catalog.htm b/site/user/api/catalog.htm index 52b2f6a832..e1fe83ea30 100644 --- a/site/user/api/catalog.htm +++ b/site/user/api/catalog.htm @@ -4765,7 +4765,7 @@ "code": "void draw(SkCanvas* canvas) {\n // sk_sp image;\n SkImage* imagePtr = image.get();\n canvas->drawImage(imagePtr, 0, 0);\n SkPaint paint;\n canvas->drawImage(imagePtr, 80, 0, &paint);\n paint.setAlpha(0x80);\n canvas->drawImage(imagePtr, 160, 0, &paint);\n}\n", "width": 256, "height": 64, - "hash": "ac93f30dff13f8a8bb31398de370863b", + "hash": "185746dc0faa6f1df30c4afe098646ff", "file": "SkCanvas_Reference", "name": "SkCanvas::drawImage" }, @@ -5469,7 +5469,7 @@ "code": "void draw(SkCanvas* canvas) {\n canvas->scale(.5f, .5f);\n SkImageInfo imageInfo = source.info();\n SkIRect bounds = imageInfo.bounds();\n for (int x : { 0, bounds.width() } ) {\n for (int y : { 0, bounds.height() } ) {\n canvas->drawBitmap(source, x, y);\n }\n }\n}", "width": 256, "height": 64, - "hash": "3ce3db36235d80dbac4d39504cf756da", + "hash": "a818be8945cd0c18f99ffe53e90afa48", "file": "SkImageInfo_Reference", "name": "SkImageInfo::bounds()" }, -- cgit v1.2.3