diff options
author | Ruiqi Mao <ruiqimao@google.com> | 2018-07-03 21:18:07 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-03 21:18:18 +0000 |
commit | c05aa7d163fd0b930fa450d2e4c7f2497f036254 (patch) | |
tree | d741730ca4b88ade1f73f4f2c20dec0ad1789464 /site | |
parent | 5ffcb4d20e3f9798daa013f2b4d00bfb4a9a01da (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 'site')
-rw-r--r-- | site/user/api/SkCanvas_Reference.md | 10 | ||||
-rw-r--r-- | site/user/api/SkIRect_Reference.md | 4 | ||||
-rw-r--r-- | site/user/api/SkImageInfo_Reference.md | 2 | ||||
-rw-r--r-- | site/user/api/SkImage_Reference.md | 2 | ||||
-rw-r--r-- | site/user/api/SkMatrix_Reference.md | 2 | ||||
-rw-r--r-- | site/user/api/SkPaint_Reference.md | 4 | ||||
-rw-r--r-- | site/user/api/SkPath_Reference.md | 4 | ||||
-rw-r--r-- | site/user/api/SkPixmap_Reference.md | 4 | ||||
-rw-r--r-- | site/user/api/SkPoint_Reference.md | 2 | ||||
-rw-r--r-- | site/user/api/SkRRect_Reference.md | 6 | ||||
-rw-r--r-- | site/user/api/SkRect_Reference.md | 2 | ||||
-rw-r--r-- | site/user/api/SkSurface_Reference.md | 2 | ||||
-rw-r--r-- | site/user/api/catalog.htm | 4 |
13 files changed, 23 insertions, 25 deletions
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 <a href='#Matrix'>Matrix</a>. ### Example -<div><fiddle-embed name="eb93d5fa66a5f7a10f4f9210494d7222"><div><a href='#SkCanvas_scale'>scale</a> followed by <a href='#SkCanvas_translate'>translate</a> produces different results from <a href='#SkCanvas_translate'>translate</a> followed +<div><fiddle-embed name="53c212c4f2449df0b0eedbc6227b6ab7"><div><a href='#SkCanvas_scale'>scale</a> followed by <a href='#SkCanvas_translate'>translate</a> produces different results from <a href='#SkCanvas_translate'>translate</a> followed by <a href='#SkCanvas_scale'>scale</a>. The blue stroke follows translate of (50, 50); a black @@ -4662,7 +4662,7 @@ and so on; or nullptr</td> ### Example -<div><fiddle-embed name="ac93f30dff13f8a8bb31398de370863b"></fiddle-embed></div> +<div><fiddle-embed name="185746dc0faa6f1df30c4afe098646ff"></fiddle-embed></div> ### See Also @@ -6412,7 +6412,7 @@ void <a href='#SkCanvas_drawPicture'>drawPicture</a>(const <a href='SkPicture_Re ### Example -<div><fiddle-embed name="759e4e5bac680838added8f70884dcdc"></fiddle-embed></div> +<div><fiddle-embed name="9adda80b2dd1b08ec5ccf66da7c8bd91"></fiddle-embed></div> ### See Also @@ -6537,7 +6537,6 @@ contains <a href='undocumented#Shader'>Shader</a>, <a href='SkBlendMode_Referenc The first element of <a href='#SkCanvas_drawVertices_3_bones'>bones</a> 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. -<a href='#SkCanvas_drawVertices_3_boneCount'>boneCount</a> must be at most 100, and thus the size of <a href='#SkCanvas_drawVertices_3_bones'>bones</a> should be at most 100. ### Parameters @@ -6582,7 +6581,6 @@ contains <a href='undocumented#Shader'>Shader</a>, <a href='SkBlendMode_Referenc The first element of <a href='#SkCanvas_drawVertices_4_bones'>bones</a> 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. -<a href='#SkCanvas_drawVertices_4_boneCount'>boneCount</a> must be at most 100, and thus the size of <a href='#SkCanvas_drawVertices_4_bones'>bones</a> should be at most 100. ### Parameters @@ -6775,7 +6773,7 @@ If <a href='#SkCanvas_drawAtlas_cullRect'>cullRect</a> is outside of <a href='#C ### Example -<div><fiddle-embed name="1df575f9b8132306ce0552a2554ed132"></fiddle-embed></div> +<div><fiddle-embed name="fe79a9c1ec350264eb9c7b2509dd3638"></fiddle-embed></div> ### See Also diff --git a/site/user/api/SkIRect_Reference.md b/site/user/api/SkIRect_Reference.md index 06e581f015..829b1bf41e 100644 --- a/site/user/api/SkIRect_Reference.md +++ b/site/user/api/SkIRect_Reference.md @@ -1504,7 +1504,7 @@ If <a href='#SkIRect_makeInset_dy'>dy</a> is positive, <a href='#IRect'>IRect</a ### Example -<div><fiddle-embed name="1db94b2c76e0a7a71856532335fa56b6"> +<div><fiddle-embed name="a7958a4e0668f5cf805a8e78eb57f51d"> #### Example Output @@ -2277,7 +2277,7 @@ true if <a href='#SkIRect_intersectNoEmptyCheck_a'>a</a> and <a href='#SkIRect_i ### Example -<div><fiddle-embed name="d35fbc9fdea71df8b8a12fd3da50d11c"> +<div><fiddle-embed name="a98993a66616ae406d8bdc54adfb1411"> #### Example Output diff --git a/site/user/api/SkImageInfo_Reference.md b/site/user/api/SkImageInfo_Reference.md index 07702da3b4..0edfe5baf5 100644 --- a/site/user/api/SkImageInfo_Reference.md +++ b/site/user/api/SkImageInfo_Reference.md @@ -2035,7 +2035,7 @@ integral rectangle from origin to <a href='#SkImageInfo_width'>width</a> and <a ### Example -<div><fiddle-embed name="3ce3db36235d80dbac4d39504cf756da"></fiddle-embed></div> +<div><fiddle-embed name="a818be8945cd0c18f99ffe53e90afa48"></fiddle-embed></div> ### 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 <a href='#Image'>Image</a>, or nullptr ### Example -<div><fiddle-embed name="93669037c9eb9d142e7776b9f936fa96"></fiddle-embed></div> +<div><fiddle-embed name="4eb2d95c9e9a66f05296e345bb68bd51"></fiddle-embed></div> ### 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 -<div><fiddle-embed name="3edbdea8e43d06086abf33ec4a9b415b"></fiddle-embed></div> +<div><fiddle-embed name="27a0ab44659201f1aa2ac7fea73368c2"></fiddle-embed></div> ### 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 <a href='SkColor_Reference#Alpha'>Alpha</a> and RGB used when stroking and ### Example -<div><fiddle-embed name="6e70f18300bd676a3c056ceb6b62f8df"> +<div><fiddle-embed name="9adda80b2dd1b08ec5ccf66da7c8bd91"> #### Example Output @@ -4477,7 +4477,7 @@ typographic height of text ### Example -<div><fiddle-embed name="983e2a71ba72d4ba8c945420040b8f1c"></fiddle-embed></div> +<div><fiddle-embed name="29b98ebf58aa9fd1edfaabf9f4490b3a"></fiddle-embed></div> --- 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 <a href='#Path'>Path</a> in memory is not guaranteed. ### Example -<div><fiddle-embed name="2c6aff73608cd198659db6d1eeaaae4f"> +<div><fiddle-embed name="882e8e0103048009a25cfc20400492f7"> #### Example Output @@ -5753,7 +5753,7 @@ degenerate data. ### Example -<div><fiddle-embed name="2f53df9201769ab7e7c0e164a1334309"><div>Ignoring the actual <a href='#Verb'>Verbs</a> and replacing them with <a href='#Quad'>Quads</a> rounds the +<div><fiddle-embed name="882e8e0103048009a25cfc20400492f7"><div>Ignoring the actual <a href='#Verb'>Verbs</a> and replacing them with <a href='#Quad'>Quads</a> rounds the path of the glyph. </div></fiddle-embed></div> 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 -<div><fiddle-embed name="6e0f558bf7fabc655041116288559134"> +<div><fiddle-embed name="ab9b3aef7896aee80b780789848fbba4"> #### Example Output @@ -1109,7 +1109,7 @@ readable unsigned 8-bit pointer to pixels ### Example -<div><fiddle-embed name="9adda80b2dd1b08ec5ccf66da7c8bd91"> +<div><fiddle-embed name="2bffb6384cc20077e632e7d01da045ca"> #### 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 <a href='#Point'>Point</a> multiplied by scale. ### Example -<div><fiddle-embed name="35b3bc675779de043706ae4817ee950c"></fiddle-embed></div> +<div><fiddle-embed name="2bffb6384cc20077e632e7d01da045ca"></fiddle-embed></div> ### 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 <a href='undocumented#Oval'>Oval</a> ### Example -<div><fiddle-embed name="ab9b3aef7896aee80b780789848fbba4"><div>The first radii are scaled down proportionately until both x-axis and y-axis fit +<div><fiddle-embed name="6ac569e40fb68c758319e85428b9ae95"><div>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 <a href='#SkRRect_kSimple_Type'>kSimple Type</a>. ### Example -<div><fiddle-embed name="6ac569e40fb68c758319e85428b9ae95"></fiddle-embed></div> +<div><fiddle-embed name="a7958a4e0668f5cf805a8e78eb57f51d"></fiddle-embed></div> ### See Also @@ -1292,7 +1292,7 @@ bounding box ### Example -<div><fiddle-embed name="4577e2dcb086b241bb43d8b89ee0b0dd"></fiddle-embed></div> +<div><fiddle-embed name="a7958a4e0668f5cf805a8e78eb57f51d"></fiddle-embed></div> ### 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 <a href='#SkRect_sort'>sort</a> to reverse <a href='#SkRect_fTop'>fTop</a> a ### Example -<div><fiddle-embed name="a98993a66616ae406d8bdc54adfb1411"> +<div><fiddle-embed name="795061764b10c9e05efb466c9cb60644"> #### 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 <a href='#SkSurface_makeImageSnapshot'>makeImageSnapshot< ### Example -<div><fiddle-embed name="99a54b814ccab7d2b1143c88581649ff"> +<div><fiddle-embed name="8b8a4cd8a29d22bb9c5e63b70357bd65"> #### 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<SkImage> 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()" }, |