aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu
Commit message (Collapse)AuthorAge
* Only use flat varyings for integer texIndex.Gravatar Jim Van Verth2017-11-20
| | | | | | | | | | Flat varyings aren't supported with ES 2.0, so just fall back to non-flat if we can only handle float. Change-Id: Id47a773b86666c46916efe5bcb1c629743977ccf Reviewed-on: https://skia-review.googlesource.com/73800 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
* Use int when possible to calculate atlas indices in shaders.Gravatar Jim Van Verth2017-11-20
| | | | | | | | | | | | | | | | On certain iOS devices half has a mantissa of only 10 bits, which is not enough to perform the floating point trickery to get the lower bits out of the "texture coordinates". Instead we use int if available, and float if not available. Also re-enables multitexturing for iOS and adds a sample which stresses the issue. Bug: skia:7285 Change-Id: I365532c7cbbcca7c7753af209bef46e05be49e11 Reviewed-on: https://skia-review.googlesource.com/71181 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
* Revert "Revert "Add Atlas Text interface for rendering SDF glyphs.""Gravatar Brian Salomon2017-11-19
| | | | | | | | | | This reverts commit 9c2202ffc22b4293b48a4edeafa1b5d2bab8bb83. Bug: skia: Change-Id: I482ddf74f8e40d3d0908c840ba5c6ff981ccefbd Reviewed-on: https://skia-review.googlesource.com/73345 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
* Fix assert in blink chromeosGravatar Greg Daniel2017-11-19
| | | | | | | | Bug: skia: Change-Id: I894effdde72a8777e0f943decc327d1c6616a69d Reviewed-on: https://skia-review.googlesource.com/73520 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
* Revert "Revert "Revert "Revert "Revert "Revert "Add private grpixelconfigs ↵Gravatar Greg Daniel2017-11-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for alpha_8 and alpha_half"""""" This reverts commit b092cea5b17420926557d0e8b8d2df6db894725c. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Revert "Revert "Revert "Revert "Add private grpixelconfigs for alpha_8 and alpha_half""""" > > This reverts commit 68ab18611a03449915dfe2ffef96a849b72aa95c. > > Reason for revert: Command Buffer bot > > Original change's description: > > Revert "Revert "Revert "Revert "Add private grpixelconfigs for alpha_8 and alpha_half"""" > > > > This reverts commit 3b2f5b60ff9a82ade01746d7e7cbbcc9348d6c03. > > > > Reason for revert: more attempts at a fixed version > > > > Original change's description: > > > Revert "Revert "Revert "Add private grpixelconfigs for alpha_8 and alpha_half""" > > > > > > This reverts commit b5fb7cf0163ccb939f90ecf53ef70732c01f23ae. > > > > > > Reason for revert: breaking more devices > > > > > > Original change's description: > > > > Revert "Revert "Add private grpixelconfigs for alpha_8 and alpha_half"" > > > > > > > > This reverts commit 0fb6db4be6e30777cc5c87f1b601e8c4aacff2b1. > > > > > > > > Reason for revert: fixed bug > > > > > > > > Original change's description: > > > > > Revert "Add private grpixelconfigs for alpha_8 and alpha_half" > > > > > > > > > > This reverts commit 33d17cbb003975fff895954435183756f9893c17. > > > > > > > > > > Reason for revert: broke intel bots > > > > > > > > > > Original change's description: > > > > > > Add private grpixelconfigs for alpha_8 and alpha_half > > > > > > > > > > > > Bug: skia: > > > > > > Change-Id: I5191b6e045aea2a5af2b305b5972ad1e638a7ace > > > > > > Reviewed-on: https://skia-review.googlesource.com/71763 > > > > > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > > > > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > > > > > > > > > TBR=egdaniel@google.com,bsalomon@google.com > > > > > > > > > > Change-Id: I6fff9241f7878f1ec7fad2663df9922c9cd8f628 > > > > > No-Presubmit: true > > > > > No-Tree-Checks: true > > > > > No-Try: true > > > > > Bug: skia: > > > > > Reviewed-on: https://skia-review.googlesource.com/72180 > > > > > Reviewed-by: Greg Daniel <egdaniel@google.com> > > > > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > > > > > > > TBR=egdaniel@google.com,bsalomon@google.com > > > > > > > > Change-Id: Ie028961ecbf5934c53cb859e019e548935b3af79 > > > > Reviewed-on: https://skia-review.googlesource.com/72241 > > > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > > > Reviewed-by: Greg Daniel <egdaniel@google.com> > > > > > > TBR=egdaniel@google.com,bsalomon@google.com > > > > > > Change-Id: Ieaac3eca2fc4919699c7de61a3c33348e92a7da0 > > > No-Presubmit: true > > > No-Tree-Checks: true > > > No-Try: true > > > Reviewed-on: https://skia-review.googlesource.com/72660 > > > Reviewed-by: Greg Daniel <egdaniel@google.com> > > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > > > TBR=egdaniel@google.com,bsalomon@google.com > > > > Change-Id: Ifcf1b97c2a9493ce9a77a8aa0f4e5a8fb393def3 > > Reviewed-on: https://skia-review.googlesource.com/72802 > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > Reviewed-by: Greg Daniel <egdaniel@google.com> > > TBR=egdaniel@google.com,bsalomon@google.com > > Change-Id: Ie2277f59f5a1294392b5d153ce2429c20b3e4182 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/73320 > Reviewed-by: Brian Osman <brianosman@google.com> > Commit-Queue: Brian Osman <brianosman@google.com> TBR=egdaniel@google.com,bsalomon@google.com,brianosman@google.com Change-Id: Ibba9d2109f35ea710e313d604b3e5ee742916234 Reviewed-on: https://skia-review.googlesource.com/73360 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com>
* Revert "Add Atlas Text interface for rendering SDF glyphs."Gravatar Greg Daniel2017-11-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 39631f3df172feb385527a5d125bc53b0bded7e6. Reason for revert: break google3 rool Original change's description: > Add Atlas Text interface for rendering SDF glyphs. > > This new API is built upon SDF text atlas code from the GPU backend. Unlike using the GPU > backend to draw text, this set of interfaces allows the client to render the SDF glyphs. The > client issues text draws to potentially multiple targets and then the client flushes. The > client then gets commands from Skia with data to put into a texture atlas and vertices to > draw that reference the texture. The client is responsible for creating the texture, uploading > the SDF data to the texture, and drawing the vertices provided by Skia. > > Change-Id: Ie9447e19b85f0ce1c2b942e5216c787a74f335d3 > Reviewed-on: https://skia-review.googlesource.com/59360 > Commit-Queue: Brian Salomon <bsalomon@google.com> > Reviewed-by: Robert Phillips <robertphillips@google.com> TBR=jvanverth@google.com,bsalomon@google.com,robertphillips@google.com Change-Id: I4aad0c99e645b476fd8ba25731f2a10e8802bb25 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/73420 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
* Add Atlas Text interface for rendering SDF glyphs.Gravatar Brian Salomon2017-11-17
| | | | | | | | | | | | | | This new API is built upon SDF text atlas code from the GPU backend. Unlike using the GPU backend to draw text, this set of interfaces allows the client to render the SDF glyphs. The client issues text draws to potentially multiple targets and then the client flushes. The client then gets commands from Skia with data to put into a texture atlas and vertices to draw that reference the texture. The client is responsible for creating the texture, uploading the SDF data to the texture, and drawing the vertices provided by Skia. Change-Id: Ie9447e19b85f0ce1c2b942e5216c787a74f335d3 Reviewed-on: https://skia-review.googlesource.com/59360 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
* converted Premul / Unpremul to SkSLGravatar Ethan Nicholas2017-11-17
| | | | | | | | Bug: skia: Change-Id: I4944badbb530e17b9ff7cca389f943e0b5982e01 Reviewed-on: https://skia-review.googlesource.com/72983 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
* Revert "Revert "Revert "Revert "Revert "Add private grpixelconfigs for ↵Gravatar Brian Osman2017-11-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | alpha_8 and alpha_half""""" This reverts commit 68ab18611a03449915dfe2ffef96a849b72aa95c. Reason for revert: Command Buffer bot Original change's description: > Revert "Revert "Revert "Revert "Add private grpixelconfigs for alpha_8 and alpha_half"""" > > This reverts commit 3b2f5b60ff9a82ade01746d7e7cbbcc9348d6c03. > > Reason for revert: more attempts at a fixed version > > Original change's description: > > Revert "Revert "Revert "Add private grpixelconfigs for alpha_8 and alpha_half""" > > > > This reverts commit b5fb7cf0163ccb939f90ecf53ef70732c01f23ae. > > > > Reason for revert: breaking more devices > > > > Original change's description: > > > Revert "Revert "Add private grpixelconfigs for alpha_8 and alpha_half"" > > > > > > This reverts commit 0fb6db4be6e30777cc5c87f1b601e8c4aacff2b1. > > > > > > Reason for revert: fixed bug > > > > > > Original change's description: > > > > Revert "Add private grpixelconfigs for alpha_8 and alpha_half" > > > > > > > > This reverts commit 33d17cbb003975fff895954435183756f9893c17. > > > > > > > > Reason for revert: broke intel bots > > > > > > > > Original change's description: > > > > > Add private grpixelconfigs for alpha_8 and alpha_half > > > > > > > > > > Bug: skia: > > > > > Change-Id: I5191b6e045aea2a5af2b305b5972ad1e638a7ace > > > > > Reviewed-on: https://skia-review.googlesource.com/71763 > > > > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > > > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > > > > > > > TBR=egdaniel@google.com,bsalomon@google.com > > > > > > > > Change-Id: I6fff9241f7878f1ec7fad2663df9922c9cd8f628 > > > > No-Presubmit: true > > > > No-Tree-Checks: true > > > > No-Try: true > > > > Bug: skia: > > > > Reviewed-on: https://skia-review.googlesource.com/72180 > > > > Reviewed-by: Greg Daniel <egdaniel@google.com> > > > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > > > > > TBR=egdaniel@google.com,bsalomon@google.com > > > > > > Change-Id: Ie028961ecbf5934c53cb859e019e548935b3af79 > > > Reviewed-on: https://skia-review.googlesource.com/72241 > > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > > Reviewed-by: Greg Daniel <egdaniel@google.com> > > > > TBR=egdaniel@google.com,bsalomon@google.com > > > > Change-Id: Ieaac3eca2fc4919699c7de61a3c33348e92a7da0 > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Reviewed-on: https://skia-review.googlesource.com/72660 > > Reviewed-by: Greg Daniel <egdaniel@google.com> > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > TBR=egdaniel@google.com,bsalomon@google.com > > Change-Id: Ifcf1b97c2a9493ce9a77a8aa0f4e5a8fb393def3 > Reviewed-on: https://skia-review.googlesource.com/72802 > Commit-Queue: Greg Daniel <egdaniel@google.com> > Reviewed-by: Greg Daniel <egdaniel@google.com> TBR=egdaniel@google.com,bsalomon@google.com Change-Id: Ie2277f59f5a1294392b5d153ce2429c20b3e4182 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/73320 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
* Revert "Revert "Revert "Revert "Add private grpixelconfigs for alpha_8 and ↵Gravatar Greg Daniel2017-11-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | alpha_half"""" This reverts commit 3b2f5b60ff9a82ade01746d7e7cbbcc9348d6c03. Reason for revert: more attempts at a fixed version Original change's description: > Revert "Revert "Revert "Add private grpixelconfigs for alpha_8 and alpha_half""" > > This reverts commit b5fb7cf0163ccb939f90ecf53ef70732c01f23ae. > > Reason for revert: breaking more devices > > Original change's description: > > Revert "Revert "Add private grpixelconfigs for alpha_8 and alpha_half"" > > > > This reverts commit 0fb6db4be6e30777cc5c87f1b601e8c4aacff2b1. > > > > Reason for revert: fixed bug > > > > Original change's description: > > > Revert "Add private grpixelconfigs for alpha_8 and alpha_half" > > > > > > This reverts commit 33d17cbb003975fff895954435183756f9893c17. > > > > > > Reason for revert: broke intel bots > > > > > > Original change's description: > > > > Add private grpixelconfigs for alpha_8 and alpha_half > > > > > > > > Bug: skia: > > > > Change-Id: I5191b6e045aea2a5af2b305b5972ad1e638a7ace > > > > Reviewed-on: https://skia-review.googlesource.com/71763 > > > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > > > > > TBR=egdaniel@google.com,bsalomon@google.com > > > > > > Change-Id: I6fff9241f7878f1ec7fad2663df9922c9cd8f628 > > > No-Presubmit: true > > > No-Tree-Checks: true > > > No-Try: true > > > Bug: skia: > > > Reviewed-on: https://skia-review.googlesource.com/72180 > > > Reviewed-by: Greg Daniel <egdaniel@google.com> > > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > > > TBR=egdaniel@google.com,bsalomon@google.com > > > > Change-Id: Ie028961ecbf5934c53cb859e019e548935b3af79 > > Reviewed-on: https://skia-review.googlesource.com/72241 > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > Reviewed-by: Greg Daniel <egdaniel@google.com> > > TBR=egdaniel@google.com,bsalomon@google.com > > Change-Id: Ieaac3eca2fc4919699c7de61a3c33348e92a7da0 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/72660 > Reviewed-by: Greg Daniel <egdaniel@google.com> > Commit-Queue: Greg Daniel <egdaniel@google.com> TBR=egdaniel@google.com,bsalomon@google.com Change-Id: Ifcf1b97c2a9493ce9a77a8aa0f4e5a8fb393def3 Reviewed-on: https://skia-review.googlesource.com/72802 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com>
* Do not return null paint if shaderFP is nullGravatar Yuqian Li2017-11-17
| | | | | | | | | | | | | | | | | | | This fixes the ripple bug reported by LG: https://b.corp.google.com/issues/68964656 In that bug, the button is so tall that our image shader returns a null fragment processor because the height exceeds GL_MAX_TEXTURE_SIZE. If we return null paint, the ripple is completely gone. This CL returns a default paint so we can still see the ripple, and that matches HWUI's behaviour. A GM will be added later after some other urgent Android ripple bug fixes. Bug: skia: Change-Id: I9bcafc078916a6a15fbd84d2019f39ac88d2b2f8 Reviewed-on: https://skia-review.googlesource.com/73200 Commit-Queue: Yuqian Li <liyuqian@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
* converted GrAARectEffect to SkSLGravatar Ethan Nicholas2017-11-16
| | | | | | | | Bug: skia: Change-Id: I08254806fe7cb97dab21c5625aa16dd34aea9468 Reviewed-on: https://skia-review.googlesource.com/72120 Reviewed-by: Chris Dalton <csmartdalton@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
* Reland "Fold analytic clip FPs into GrReducedClip"Gravatar Chris Dalton2017-11-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a reland of 4355b26b359d5f2597a10012e7eb11fb3a1f025b Original change's description: > Fold analytic clip FPs into GrReducedClip > > Perf result on Pixel phone (sorted by impact): > > GEOMEAN 7.44 -> 6.92 ms [ 93%] > > keymobi_cnn_com.skp 3.55 -> 3.59 ms [101%] > keymobi_theverge_com.skp 4.08 -> 4.13 ms [101%] > desk_skbug6850autoscroll.skp 1.21 -> 1.22 ms [101%] > ... > top25desk_weather_com.skp 14.2 -> 11.5 ms [ 81%] > keymobi_androidpolice_com_2012_.skp 3.84 -> 2.95 ms [ 77%] > keymobi_shop_mobileweb_ebay_com.skp 2.94 -> 2.26 ms [ 77%] > keymobi_boingboing_net.skp 3.08 -> 2.24 ms [ 73%] > desk_jsfiddlebigcar.skp 1.90 -> 1.25 ms [ 66%] > keymobi_m_youtube_com_watch_v_9.skp 13.5 -> 8.84 ms [ 65%] > keymobi_sfgate_com_.skp 8.55 -> 5.55 ms [ 65%] > keymobi_blogger.skp 4.01 -> 2.60 ms [ 65%] > > Cleaner code, improved skps, slightly better geometric mean time. > > Pixel C is mostly unaffected, presumably because it uses window > rectangles. > > Bug: skia:7190 > Change-Id: Ia93f68b2f971ea66b3ab19dc73557ea602932a92 > Reviewed-on: https://skia-review.googlesource.com/67424 > Commit-Queue: Chris Dalton <csmartdalton@google.com> > Reviewed-by: Brian Salomon <bsalomon@google.com> TBR=bsalomon@google.com Bug: skia:7190 Change-Id: I92f1ed21b6292feb3209fcbd1725487784d420da Reviewed-on: https://skia-review.googlesource.com/72562 Reviewed-by: Chris Dalton <csmartdalton@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
* Reland "Fix precision caps and rrect/ellipse effect precisions"Gravatar Chris Dalton2017-11-16
| | | | | | | | | | | | | | | | | | | | | | | | | This is a reland of e42180022720f2fcfd3c634cad855506a7940591 Original change's description: > Fix precision caps and rrect/ellipse effect precisions > > Replaces all the complex precision caps with a single flag that says > whether "float" == fp32. Updates the ellipse and rrect effects to > use float coords, and use the scale workaround when float != fp32. > > Bug: skia:7190 > Change-Id: Ieccff9f38acd05e5cec78fe90d01a5da901a9307 > Reviewed-on: https://skia-review.googlesource.com/70961 > Commit-Queue: Chris Dalton <csmartdalton@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > Reviewed-by: Brian Salomon <bsalomon@google.com> TBR=bsalomon@google.com Bug: skia:7190 Change-Id: I7ced37a64164b83d86f6a957c35e10ce9085aba0 Reviewed-on: https://skia-review.googlesource.com/72760 Reviewed-by: Chris Dalton <csmartdalton@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
* Revert "Revert "Revert "Add private grpixelconfigs for alpha_8 and alpha_half"""Gravatar Greg Daniel2017-11-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b5fb7cf0163ccb939f90ecf53ef70732c01f23ae. Reason for revert: breaking more devices Original change's description: > Revert "Revert "Add private grpixelconfigs for alpha_8 and alpha_half"" > > This reverts commit 0fb6db4be6e30777cc5c87f1b601e8c4aacff2b1. > > Reason for revert: fixed bug > > Original change's description: > > Revert "Add private grpixelconfigs for alpha_8 and alpha_half" > > > > This reverts commit 33d17cbb003975fff895954435183756f9893c17. > > > > Reason for revert: broke intel bots > > > > Original change's description: > > > Add private grpixelconfigs for alpha_8 and alpha_half > > > > > > Bug: skia: > > > Change-Id: I5191b6e045aea2a5af2b305b5972ad1e638a7ace > > > Reviewed-on: https://skia-review.googlesource.com/71763 > > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > > > TBR=egdaniel@google.com,bsalomon@google.com > > > > Change-Id: I6fff9241f7878f1ec7fad2663df9922c9cd8f628 > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Bug: skia: > > Reviewed-on: https://skia-review.googlesource.com/72180 > > Reviewed-by: Greg Daniel <egdaniel@google.com> > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > TBR=egdaniel@google.com,bsalomon@google.com > > Change-Id: Ie028961ecbf5934c53cb859e019e548935b3af79 > Reviewed-on: https://skia-review.googlesource.com/72241 > Commit-Queue: Greg Daniel <egdaniel@google.com> > Reviewed-by: Greg Daniel <egdaniel@google.com> TBR=egdaniel@google.com,bsalomon@google.com Change-Id: Ieaac3eca2fc4919699c7de61a3c33348e92a7da0 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/72660 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
* Revert "Revert "Add private grpixelconfigs for alpha_8 and alpha_half""Gravatar Greg Daniel2017-11-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0fb6db4be6e30777cc5c87f1b601e8c4aacff2b1. Reason for revert: fixed bug Original change's description: > Revert "Add private grpixelconfigs for alpha_8 and alpha_half" > > This reverts commit 33d17cbb003975fff895954435183756f9893c17. > > Reason for revert: broke intel bots > > Original change's description: > > Add private grpixelconfigs for alpha_8 and alpha_half > > > > Bug: skia: > > Change-Id: I5191b6e045aea2a5af2b305b5972ad1e638a7ace > > Reviewed-on: https://skia-review.googlesource.com/71763 > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > TBR=egdaniel@google.com,bsalomon@google.com > > Change-Id: I6fff9241f7878f1ec7fad2663df9922c9cd8f628 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia: > Reviewed-on: https://skia-review.googlesource.com/72180 > Reviewed-by: Greg Daniel <egdaniel@google.com> > Commit-Queue: Greg Daniel <egdaniel@google.com> TBR=egdaniel@google.com,bsalomon@google.com Change-Id: Ie028961ecbf5934c53cb859e019e548935b3af79 Reviewed-on: https://skia-review.googlesource.com/72241 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com>
* Add overbudget handling to GrResourceAllocatorGravatar Robert Phillips2017-11-16
| | | | | | | Change-Id: I5536c908310e907c77b5d55441a0edac6a74bf0e Reviewed-on: https://skia-review.googlesource.com/71182 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
* Revert "Fix precision caps and rrect/ellipse effect precisions"Gravatar Brian Osman2017-11-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e42180022720f2fcfd3c634cad855506a7940591. Reason for revert: Also may be responsible for layout test failures? Playing it safe. Original change's description: > Fix precision caps and rrect/ellipse effect precisions > > Replaces all the complex precision caps with a single flag that says > whether "float" == fp32. Updates the ellipse and rrect effects to > use float coords, and use the scale workaround when float != fp32. > > Bug: skia:7190 > Change-Id: Ieccff9f38acd05e5cec78fe90d01a5da901a9307 > Reviewed-on: https://skia-review.googlesource.com/70961 > Commit-Queue: Chris Dalton <csmartdalton@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > Reviewed-by: Brian Salomon <bsalomon@google.com> TBR=egdaniel@google.com,bsalomon@google.com,csmartdalton@google.com,ethannicholas@google.com Change-Id: Idca2f0390e7a0eb85010255183f2f27332b8d26d No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:7190 Reviewed-on: https://skia-review.googlesource.com/72540 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
* Revert "Fold analytic clip FPs into GrReducedClip"Gravatar Brian Osman2017-11-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4355b26b359d5f2597a10012e7eb11fb3a1f025b. Reason for revert: Most likely CL for layout test failures on Chrome roll: https://bugs.chromium.org/p/chromium/issues/detail?id=785931 Original change's description: > Fold analytic clip FPs into GrReducedClip > > Perf result on Pixel phone (sorted by impact): > > GEOMEAN 7.44 -> 6.92 ms [ 93%] > > keymobi_cnn_com.skp 3.55 -> 3.59 ms [101%] > keymobi_theverge_com.skp 4.08 -> 4.13 ms [101%] > desk_skbug6850autoscroll.skp 1.21 -> 1.22 ms [101%] > ... > top25desk_weather_com.skp 14.2 -> 11.5 ms [ 81%] > keymobi_androidpolice_com_2012_.skp 3.84 -> 2.95 ms [ 77%] > keymobi_shop_mobileweb_ebay_com.skp 2.94 -> 2.26 ms [ 77%] > keymobi_boingboing_net.skp 3.08 -> 2.24 ms [ 73%] > desk_jsfiddlebigcar.skp 1.90 -> 1.25 ms [ 66%] > keymobi_m_youtube_com_watch_v_9.skp 13.5 -> 8.84 ms [ 65%] > keymobi_sfgate_com_.skp 8.55 -> 5.55 ms [ 65%] > keymobi_blogger.skp 4.01 -> 2.60 ms [ 65%] > > Cleaner code, improved skps, slightly better geometric mean time. > > Pixel C is mostly unaffected, presumably because it uses window > rectangles. > > Bug: skia:7190 > Change-Id: Ia93f68b2f971ea66b3ab19dc73557ea602932a92 > Reviewed-on: https://skia-review.googlesource.com/67424 > Commit-Queue: Chris Dalton <csmartdalton@google.com> > Reviewed-by: Brian Salomon <bsalomon@google.com> TBR=bsalomon@google.com,robertphillips@google.com,csmartdalton@google.com Change-Id: I86ff05196eaaeca4fb63836c9b449bbea76fe80b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:7190 Reviewed-on: https://skia-review.googlesource.com/72480 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
* Fold analytic clip FPs into GrReducedClipGravatar Chris Dalton2017-11-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Perf result on Pixel phone (sorted by impact): GEOMEAN 7.44 -> 6.92 ms [ 93%] keymobi_cnn_com.skp 3.55 -> 3.59 ms [101%] keymobi_theverge_com.skp 4.08 -> 4.13 ms [101%] desk_skbug6850autoscroll.skp 1.21 -> 1.22 ms [101%] ... top25desk_weather_com.skp 14.2 -> 11.5 ms [ 81%] keymobi_androidpolice_com_2012_.skp 3.84 -> 2.95 ms [ 77%] keymobi_shop_mobileweb_ebay_com.skp 2.94 -> 2.26 ms [ 77%] keymobi_boingboing_net.skp 3.08 -> 2.24 ms [ 73%] desk_jsfiddlebigcar.skp 1.90 -> 1.25 ms [ 66%] keymobi_m_youtube_com_watch_v_9.skp 13.5 -> 8.84 ms [ 65%] keymobi_sfgate_com_.skp 8.55 -> 5.55 ms [ 65%] keymobi_blogger.skp 4.01 -> 2.60 ms [ 65%] Cleaner code, improved skps, slightly better geometric mean time. Pixel C is mostly unaffected, presumably because it uses window rectangles. Bug: skia:7190 Change-Id: Ia93f68b2f971ea66b3ab19dc73557ea602932a92 Reviewed-on: https://skia-review.googlesource.com/67424 Commit-Queue: Chris Dalton <csmartdalton@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
* Fix precision caps and rrect/ellipse effect precisionsGravatar Chris Dalton2017-11-16
| | | | | | | | | | | | | Replaces all the complex precision caps with a single flag that says whether "float" == fp32. Updates the ellipse and rrect effects to use float coords, and use the scale workaround when float != fp32. Bug: skia:7190 Change-Id: Ieccff9f38acd05e5cec78fe90d01a5da901a9307 Reviewed-on: https://skia-review.googlesource.com/70961 Commit-Queue: Chris Dalton <csmartdalton@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
* Revert "Add private grpixelconfigs for alpha_8 and alpha_half"Gravatar Greg Daniel2017-11-15
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 33d17cbb003975fff895954435183756f9893c17. Reason for revert: broke intel bots Original change's description: > Add private grpixelconfigs for alpha_8 and alpha_half > > Bug: skia: > Change-Id: I5191b6e045aea2a5af2b305b5972ad1e638a7ace > Reviewed-on: https://skia-review.googlesource.com/71763 > Reviewed-by: Brian Salomon <bsalomon@google.com> > Commit-Queue: Greg Daniel <egdaniel@google.com> TBR=egdaniel@google.com,bsalomon@google.com Change-Id: I6fff9241f7878f1ec7fad2663df9922c9cd8f628 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/72180 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
* Revert "Nit clean up to add private GrPixelConfig CL"Gravatar Greg Daniel2017-11-15
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b8e4c44f5ff17dcb0d5a0a11b41bc04c57b1d8e4. Reason for revert: reverting parent Original change's description: > Nit clean up to add private GrPixelConfig CL > > Bug: skia: > Change-Id: Iaf793e79458ec27f81c48ec0a7d529b9127bd839 > Reviewed-on: https://skia-review.googlesource.com/72061 > Reviewed-by: Greg Daniel <egdaniel@google.com> > Commit-Queue: Greg Daniel <egdaniel@google.com> TBR=egdaniel@google.com,bsalomon@google.com Change-Id: I3f92168ed490e6f5a535a4b3c16f1fea869feb59 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/72160 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
* Nit clean up to add private GrPixelConfig CLGravatar Greg Daniel2017-11-15
| | | | | | | | Bug: skia: Change-Id: Iaf793e79458ec27f81c48ec0a7d529b9127bd839 Reviewed-on: https://skia-review.googlesource.com/72061 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
* Ensure that removing last extension from GrGLExtension doesn't assert.Gravatar Vladimir Levin2017-11-15
| | | | | | | | | | | | | | | | This patch fixes an assert that triggers when removing the last extension in the list, since the index operator goes out of bounds. Added a test that fails without the code changes and passes with the changes. R=bsalomon@chromium.org Change-Id: I0d561b150899c178f638dde088af773fddf112d9 Reviewed-on: https://skia-review.googlesource.com/72000 Commit-Queue: Vladimir Levin <vmpstr@chromium.org> Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
* Remove support for image load/storeGravatar Brian Salomon2017-11-15
| | | | | | | | | This isn't used and has become a maintenance burden. Change-Id: I5f3af8f91e5c4f073fe4ea30e0a7f1f61efeea47 Reviewed-on: https://skia-review.googlesource.com/70640 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
* Add private grpixelconfigs for alpha_8 and alpha_halfGravatar Greg Daniel2017-11-15
| | | | | | | | Bug: skia: Change-Id: I5191b6e045aea2a5af2b305b5972ad1e638a7ace Reviewed-on: https://skia-review.googlesource.com/71763 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
* Temporarily disable multitexturing for iOSGravatar Jim Van Verth2017-11-15
| | | | | | | | Bug: skia:7285 Change-Id: Ia55084334dab7b1887320348fa7d291f64332fdb Reviewed-on: https://skia-review.googlesource.com/71780 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
* Fix GrTextureOp to check the correct cap for multitexturingGravatar Brian Salomon2017-11-15
| | | | | | | Change-Id: I276dff12055b046423ed261d014bc58302fb1347 Reviewed-on: https://skia-review.googlesource.com/70680 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
* Alloc glyph image correctly for SkMask::k3D_Format.Gravatar Ben Wagner2017-11-14
| | | | | | | | | | | | | | | | | | | | | | Re-enable the code to test the emboss mask filter, updating it to use the new emboss mask filter factory. Add a test to ensure that embossed text is drawn correctly, as before glyphs did not allocate the proper amount of memory for the k3D_Format which the emboss mask filter produces. Fixes SkEmbossMask::Emboss to write the whole of the mul and add planes to avoid pixel differences and MemorySanitizer errors. Update the GPU to understand the k3D_Format and use just the alpha plane, ignoring the mul and add plane which it currently cannot support. Change-Id: I90edf34a918c06b0c6b24bfc43ce7031419eca41 Reviewed-on: https://skia-review.googlesource.com/70260 Reviewed-on: https://skia-review.googlesource.com/70962 Reviewed-on: https://skia-review.googlesource.com/71282 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
* Revert "Alloc glyph image correctly for SkMask::k3D_Format."Gravatar Brian Osman2017-11-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1662257bdaaaf26b016bf2a3e329c34f7f5ed581. Reason for revert: Android still using this API Original change's description: > Alloc glyph image correctly for SkMask::k3D_Format. > > Remove the no longer used outside Skia SK_SUPPORT_LEGACY_EMBOSSMASKFILTER > define, and either delete the code it guards or update it to use the new > emboss mask filter factory. > > Re-enable the code to test the emboss mask filter. > > Add a test to ensure that embossed text is drawn correctly, as before > glyphs did not allocate the proper amount of memory for the k3D_Format > which the emboss mask filter produces. > > Fixes SkEmbossMask::Emboss to write the whole of the mul and add planes > to avoid pixel differences and MemorySanitizer errors. > > Update the GPU to understand the k3D_Format and use just the alpha > plane, ignoring the mul and add plane which it currently cannot support. > > Change-Id: Icac1a3f37d6e8c6be3151df570f5e14111e18585 > Reviewed-on: https://skia-review.googlesource.com/70260 > Reviewed-by: Herb Derby <herb@google.com> > Reviewed-on: https://skia-review.googlesource.com/70962 > Commit-Queue: Ben Wagner <bungeman@google.com> TBR=djsollen@google.com,bungeman@google.com,herb@google.com Change-Id: Id6625bae8d3bd70ce7aa3045348c04fdd146c637 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/71183 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
* Alloc glyph image correctly for SkMask::k3D_Format.Gravatar Ben Wagner2017-11-14
| | | | | | | | | | | | | | | | | | | | | | | | Remove the no longer used outside Skia SK_SUPPORT_LEGACY_EMBOSSMASKFILTER define, and either delete the code it guards or update it to use the new emboss mask filter factory. Re-enable the code to test the emboss mask filter. Add a test to ensure that embossed text is drawn correctly, as before glyphs did not allocate the proper amount of memory for the k3D_Format which the emboss mask filter produces. Fixes SkEmbossMask::Emboss to write the whole of the mul and add planes to avoid pixel differences and MemorySanitizer errors. Update the GPU to understand the k3D_Format and use just the alpha plane, ignoring the mul and add plane which it currently cannot support. Change-Id: Icac1a3f37d6e8c6be3151df570f5e14111e18585 Reviewed-on: https://skia-review.googlesource.com/70260 Reviewed-by: Herb Derby <herb@google.com> Reviewed-on: https://skia-review.googlesource.com/70962 Commit-Queue: Ben Wagner <bungeman@google.com>
* Resolve GrSurface/GrSurfaceProxy ref counting issue in GrResourceAllocatorGravatar Robert Phillips2017-11-14
| | | | | | | | | The underlying issue is/was that (given that GrResourceProvider::createApproxTexture can pull a scratch texture out of the resource cache) resources the GrResourceAllocator thought is was controlling could magically be re-assigned behind its back. This CL resolves the issue by having the GrResourceAllocator maintain a strong ref on all the resources it believes it is controlling. Change-Id: Ibcf49009dc953bd97d882177284eb57490cd5711 Reviewed-on: https://skia-review.googlesource.com/70722 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
* Move pixel config getter to private in GrBackendSurfaceGravatar Greg Daniel2017-11-13
| | | | | | | | | | | We eventually want to remove pixel config from GrBackendSurface so this helps to insure that clients don't rely on it. Bug: skia: Change-Id: I6b8435d12347fab62c0f9032addea1211aa703ca Reviewed-on: https://skia-review.googlesource.com/70642 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
* Patch up ref counting of proxies (take 2)Gravatar Robert Phillips2017-11-13
| | | | | | | | TBR=bsalomon@google.com Change-Id: I2376c6b17ac7c2b28837bafb76583934ab72558e Reviewed-on: https://skia-review.googlesource.com/70501 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
* Drop support for OSMesa in test tools and remove build botGravatar Brian Salomon2017-11-13
| | | | | | | | Change-Id: Ic85ee05fe292a36a053ca7a20ccce24a4da4fae2 Reviewed-on: https://skia-review.googlesource.com/70026 Reviewed-by: Joe Gregorio <jcgregorio@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
* sksl enum supportGravatar Ethan Nicholas2017-11-13
| | | | | | | | Bug: skia: Change-Id: I4d505b31cf8b59de12bcdbca410aafc085977ba9 Reviewed-on: https://skia-review.googlesource.com/68621 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
* Revert "Patch up ref counting of proxies"Gravatar Robert Phillips2017-11-13
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8d5ce2d9ede0c241b906f1a0df9dac3cf3c3aa55. Reason for revert: ASAN failures Original change's description: > Patch up ref counting of proxies > > Bug: skia: > Change-Id: If746283d788368bf7aad6d285f181d8531768e61 > Reviewed-on: https://skia-review.googlesource.com/70024 > Reviewed-by: Brian Salomon <bsalomon@google.com> > Commit-Queue: Robert Phillips <robertphillips@google.com> TBR=bsalomon@google.com,robertphillips@google.com Change-Id: Ia2addb2a5dacad9e9c0080d1e53084bc62b780e0 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/70540 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
* Patch up ref counting of proxiesGravatar Robert Phillips2017-11-13
| | | | | | | | Bug: skia: Change-Id: If746283d788368bf7aad6d285f181d8531768e61 Reviewed-on: https://skia-review.googlesource.com/70024 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
* Use round rather than floor for snapping text vertex positionsGravatar Brian Osman2017-11-11
| | | | | | | | Bug: skia: Change-Id: I37e93657a692a7cea49029f8694418b827dc19d5 Reviewed-on: https://skia-review.googlesource.com/70181 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
* switched GrClipEdge to an enum classGravatar Ethan Nicholas2017-11-10
| | | | | | | | Bug: skia: Change-Id: Idf41580314a32739c70721530fc3ca48e566b044 Reviewed-on: https://skia-review.googlesource.com/70023 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
* Fix precision in AARectEffectGravatar Chris Dalton2017-11-10
| | | | | | | | | | The rect should be 4 floats, not halfs. Also simplifies the non-aa FP. Bug: skia:7190 Change-Id: If0993a7a26b84bd9a4e644b8e8a37bf8ce86916a Reviewed-on: https://skia-review.googlesource.com/69800 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
* Make GrTextBlob::VertexRegenerator determine vertex stride from mask formatGravatar Brian Salomon2017-11-10
| | | | | | | Change-Id: Ib0910ca563150add6399ba3ca891ee23db3578ec Reviewed-on: https://skia-review.googlesource.com/68861 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
* Fix Flutter/Fushcia buildGravatar Robert Phillips2017-11-10
| | | | | | | | Bug: skia: Change-Id: I17d65cef0dea11b23c935a367f3ac63d50156e15 Reviewed-on: https://skia-review.googlesource.com/69880 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
* Update MDB flags to match switches in Chrome & AndroidGravatar Robert Phillips2017-11-10
| | | | | | | Change-Id: Ifea5879ab83499c9b1a3572747088f9233b20074 Reviewed-on: https://skia-review.googlesource.com/69540 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
* renamed GrPrimitiveEdgeType / GrProcessorEdgeType to GrClipEdgeTypeGravatar Ethan Nicholas2017-11-09
| | | | | | | | Bug: skia: Change-Id: I4a9af0b9b2cfa47875b2ba098098183e8dca29a7 Reviewed-on: https://skia-review.googlesource.com/69601 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
* Remove destination pointer from GrCopySurfaceOpGravatar Robert Phillips2017-11-09
| | | | | | | | | | This appears to be surplus to requirements (and the extra call in visitProxies was causing grief for explicit allocation) Bug: skia: Change-Id: Icc0b7f04fed96883408d54986b02d0f3756d56c7 Reviewed-on: https://skia-review.googlesource.com/68862 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
* Update GrFragmentProcessor handling in Make methods in SkSLGravatar Robert Phillips2017-11-08
| | | | | | | Change-Id: I89ec73049126f3b5ff695a31a94e4816d4639fcd Reviewed-on: https://skia-review.googlesource.com/68901 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
* Prepare to enable explicit gpu resource allocation (take 2)Gravatar Robert Phillips2017-11-08
| | | | | | | Change-Id: I3fd78d53e8bea84c0217b9fe6e180eaa9e4ac753 Reviewed-on: https://skia-review.googlesource.com/68920 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
* Revert "Prepare to enable explicit gpu resource allocation"Gravatar Greg Daniel2017-11-08
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f290376736b42a19b87da78c6ba2558313896860. Reason for revert: Changed generated effect instead of FP Original change's description: > Prepare to enable explicit gpu resource allocation > > Change-Id: I407e45711c61831febbac3d3d3a88e3fdde92c5f > Reviewed-on: https://skia-review.googlesource.com/68212 > Commit-Queue: Robert Phillips <robertphillips@google.com> > Reviewed-by: Brian Salomon <bsalomon@google.com> TBR=bsalomon@google.com,robertphillips@google.com Change-Id: I949500d94c7461b7cf38d615117cfcdc9a791780 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/68900 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>