aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* In Vulkan make sure to add barriers between write operationsGravatar Greg Daniel2017-03-21
| | | | | | | | | BUG=skia:6396 Change-Id: I60faf6ad9095f18c64e33a0359e30239efbac79f Reviewed-on: https://skia-review.googlesource.com/9963 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
* Have SkColorSpaceXformCanas tell SkCanvas about clips.Gravatar Mike Klein2017-03-21
| | | | | | | | | | | | This should make queries like SkCanvas::getLocalClipBounds() work. BUG=chromium:703363 Change-Id: I1d8a39880152ba1da99cc8b289072ef747271bc8 Reviewed-on: https://skia-review.googlesource.com/9915 Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org>
* Enable GLES on Intel Linux bots.Gravatar Ben Wagner2017-03-21
| | | | | | | | | | BUG=skia:6401 NOTRY=true Change-Id: Ief434ca38ffd504198e8d3656a0a869d0faa9ebf Reviewed-on: https://skia-review.googlesource.com/9822 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Ben Wagner <benjaminwagner@google.com>
* rename makeCopyForTextureParams to isACopyNeededForTextureParamsGravatar Robert Phillips2017-03-21
| | | | | | | | | | | I thought the old name was misleading split out of: https://skia-review.googlesource.com/c/8823/ (Remove GrFragmentProcessor-derived class' GrTexture-based ctors) Change-Id: I8c5fc6de487b50c9ec37843ff7501b52140dde00 Reviewed-on: https://skia-review.googlesource.com/9961 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
* Revert "Make SkImage_Gpu be deferred"Gravatar Robert Phillips2017-03-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0db235bc0278887c344eb25b4681e9cca4cf892a. Reason for revert: cc_unittests failing Original change's description: > Make SkImage_Gpu be deferred > > This CL removes the GrTexture-based ctor forcing everyone to create deferred SkImage_Gpus. > > split out into: > https://skia-review.googlesource.com/c/9106/ (Remove atlas creation from GrResourceProvider) > > Change-Id: I266bbe089c242fe54d5b7adcc7895aa5a39440a0 > Reviewed-on: https://skia-review.googlesource.com/6680 > Commit-Queue: Robert Phillips <robertphillips@google.com> > Reviewed-by: Brian Salomon <bsalomon@google.com> > TBR=bsalomon@google.com,robertphillips@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: Ia15590a1fae04b52723713760fdbf0492ad36286 Reviewed-on: https://skia-review.googlesource.com/9962 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
* Attempt to fix AMD ANGLE bots.Gravatar Brian Salomon2017-03-21
| | | | | | | | | Makes the second context used for image tests be of the same type as it was before https://skia.googlesource.com/skia/+/6405e71279e99731f89db69325c6763ec62a98e1 Change-Id: Id861214e5bea2b874ba5eae4489a982340c2f101 Reviewed-on: https://skia-review.googlesource.com/9912 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
* Followup fixes for recipe rollGravatar Eric Boren2017-03-21
| | | | | | | | | | | | | | Simplifying some environment madness. Nobody gets to modify default_env. Always apply it in run.__call__(). Add depot_tools path to PATH in default_env. Result is simpler but now default_env is applied in many more places, which should be harmless. BUG=skia: Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56 Reviewed-on: https://skia-review.googlesource.com/9916 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
* readpixels GM uses GPU image in GPU configsGravatar Brian Osman2017-03-21
| | | | | | | | | | | | This now demonstrates that readPixels does not do color sapce conversion in Ganesh (and fails completely for unpremul F16). Next: fix those issues. BUG=skia:5853 Change-Id: If3bd1882249ae85b4738ef72e16cfb87b06b9363 Reviewed-on: https://skia-review.googlesource.com/9904 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Matt Sarett <msarett@google.com>
* Add support for F32 sources to SkColorSpaceXformGravatar Matt Sarett2017-03-21
| | | | | | | | | | | | | | This also subtlely allows clients to convert between F32 and F16. BUG=skia: CQ_INCLUDE_TRYBOTS=skia.primary:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD Change-Id: Ied5f2295fce00c69d8cf85730be899f3f8597915 Reviewed-on: https://skia-review.googlesource.com/9914 Reviewed-by: Mike Reed <reed@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Matt Sarett <msarett@google.com>
* Add pre-Flush callback to GrDrawingManager (take 2)Gravatar Robert Phillips2017-03-21
| | | | | | | | | | | This will allow internal systems (e.g., fonts & path renderers) to create pre-flush atlases. Depends on: https://skia-review.googlesource.com/c/8988/ (Allow GrSurfaceProxy-derived classes to use flags when instantiating) Change-Id: I7ffc1b69defda625b6d4311e96776de4cf2abb87 Reviewed-on: https://skia-review.googlesource.com/9903 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
* Make SkImage_Gpu be deferredGravatar Robert Phillips2017-03-21
| | | | | | | | | | | | This CL removes the GrTexture-based ctor forcing everyone to create deferred SkImage_Gpus. split out into: https://skia-review.googlesource.com/c/9106/ (Remove atlas creation from GrResourceProvider) Change-Id: I266bbe089c242fe54d5b7adcc7895aa5a39440a0 Reviewed-on: https://skia-review.googlesource.com/6680 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
* Roll Recipe DEPSGravatar Eric Boren2017-03-21
| | | | | | | | | BUG=skia: Change-Id: Ic89d1b49aba842fb41c82ad6fc8f5ebe787893bd Reviewed-on: https://skia-review.googlesource.com/9884 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Ravi Mistry <rmistry@google.com>
* remove SK_SUPPORT_LEGACY_DRAWVERTICES_VIRTUAL flagGravatar Mike Reed2017-03-21
| | | | | | | | | BUG=skia:6366 Change-Id: If5e5bc2a65f2d8c66d7bef36cbb906c01225f80f Reviewed-on: https://skia-review.googlesource.com/9940 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
* Support vs2017.Gravatar Ben Wagner2017-03-21
| | | | | | | Change-Id: Icb333d34705c86f6204a5265b645a2a215e60ad6 Reviewed-on: https://skia-review.googlesource.com/9624 Commit-Queue: Mike Klein <mtklein@chromium.org> Reviewed-by: Mike Klein <mtklein@chromium.org>
* Add support for writing ICC profiles in png encodesGravatar Matt Sarett2017-03-21
| | | | | | | | | BUG=skia: Change-Id: I99eb2f157f249ed09d724461ec4a1e31db70816a Reviewed-on: https://skia-review.googlesource.com/9782 Reviewed-by: Leon Scroggins <scroggo@google.com> Commit-Queue: Matt Sarett <msarett@google.com>
* Update SKP versionGravatar UpdateSKPs2017-03-20
| | | | | | | | | | | | Automatic commit by the RecreateSKPs bot. TBR=update-skps@skia.org NO_MERGE_BUILDS Change-Id: Ib127e14dbb73735e8ec509a4b76e66554c493e1c Reviewed-on: https://skia-review.googlesource.com/9859 Reviewed-by: update-skps <update-skps@skia.org> Commit-Queue: update-skps <update-skps@skia.org>
* Revert "Revert "remove unused SkMeshUtils and SkBoundaryPatch""Gravatar Mike Reed2017-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 006c8da9c65e234f102f671e5abd41f697864c89. Reason for revert: PDFium references have been removed Original change's description: > Revert "remove unused SkMeshUtils and SkBoundaryPatch" > > This reverts commit 5e21e0991968271ee37f446de7e08620ad1b50bb. > > Reason for revert: Breaks Pdfium build see: > https://chromium-swarm.appspot.com/task?id=3504e60d4bc10810&refresh=10 > > Original change's description: > > remove unused SkMeshUtils and SkBoundaryPatch > > > > BUG=skia:6366 > > > > Change-Id: Ibacd397e0a246dbeefde074c98712ada3848a7b6 > > Reviewed-on: https://skia-review.googlesource.com/9852 > > Reviewed-by: Mike Reed <reed@google.com> > > Commit-Queue: Mike Reed <reed@google.com> > > > > TBR=djsollen@google.com,reed@google.com,reviews@skia.org > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=skia:6366 > > Change-Id: I2403bae0a17bce8eeec743c6f433bb51b214e669 > Reviewed-on: https://skia-review.googlesource.com/9891 > Reviewed-by: Stephan Altmueller <stephana@google.com> > Commit-Queue: Stephan Altmueller <stephana@google.com> > TBR=djsollen@google.com,reviews@skia.org,stephana@google.com,reed@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:6366 Change-Id: Iefe14394a09c16bd0ad00807dbda947311f926e8 Reviewed-on: https://skia-review.googlesource.com/9910 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
* reenable lua and fix bitrotGravatar Mike Reed2017-03-20
| | | | | | | | | BUG=skia:6366 Change-Id: Ia2d0a119666d8cdc790e97e06004a5900cddd0c0 Reviewed-on: https://skia-review.googlesource.com/9885 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
* Set maxVertexAttrib limit for VulkanGravatar Greg Daniel2017-03-20
| | | | | | | | | BUG=skia:6396 Change-Id: If31507816ca9978a64d3bd25b282b373d292e7aa Reviewed-on: https://skia-review.googlesource.com/9856 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
* Add $VULKAN_SDK/$Lib to lib_dirs on windowsGravatar Brian Salomon2017-03-20
| | | | | | | Change-Id: Ibdef291103ae6de081ee01789357d4ea7a6fe5ed Reviewed-on: https://skia-review.googlesource.com/9907 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
* Disable msaa nanobench on iOS due to crashesGravatar Brian Salomon2017-03-20
| | | | | | | | | BUG=skia:6399 Change-Id: I9351579cdc78a59a99cc9ecbcac0c5146d186bd1 Reviewed-on: https://skia-review.googlesource.com/9902 Reviewed-by: Ben Wagner <benjaminwagner@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
* Improvements to readpixels GMGravatar Brian Osman2017-03-20
| | | | | | | | | | | | | | | | | | | We don't support unpremultiplied images. Therefore: - Don't test unpremul source images. - After doing an unpremultiplying read, make sure to premul before drawing For this to work with F16, add support for F16 sources to SkColorSpaceXform. Public API change is comments-only. TBR=reed@google.com BUG=skia: Change-Id: Ie05b58231e99ca88cd7792b65ffbb4f390b01726 Reviewed-on: https://skia-review.googlesource.com/9900 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Matt Sarett <msarett@google.com>
* Ignore Clang's -Wdeprecated-register for flex-generated codeGravatar Roland McGrath2017-03-20
| | | | | | | | | | This change fixes the Fuchsia build. Change-Id: I9342e5aacf75067f01aff883ccf100d11b8f4462 Reviewed-on: https://skia-review.googlesource.com/9849 Reviewed-by: Michael Jurka <mikejurka@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
* Make SkMemory.h and adjust all files for usage.Gravatar Herb Derby2017-03-20
| | | | | | | | | | | | This will be rolled out in three stages: 1) make SkMemory.h and have SkTypes.h include it. 2) Adjust chromium and android. 3) no long include SkMemory.h in SkTypes.h Change-Id: If360ef5e1164d88f50b03f279e2e963ca2f57d5d Reviewed-on: https://skia-review.googlesource.com/9874 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Herb Derby <herb@google.com>
* Gray8 is supported on GPU, remove incorrect comments & checkGravatar Brian Osman2017-03-20
| | | | | | | | | BUG=skia: Change-Id: I3e5cb94b1e903d1b6ebbc36675d1c4082aef6841 Reviewed-on: https://skia-review.googlesource.com/9899 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
* Make gn directory importable in pythonGravatar Ravi Mistry2017-03-20
| | | | | | | | | | | | | | | | This will make it possible to do >>> from gn import gn_to_bp instead of: >>> sys.path.append('gn') >>> import gn_to_bp in the new Android autoroller BUG=skia:5538 Change-Id: I4fe851247ab6dd5bc553b8315ad91281819fbc7e Reviewed-on: https://skia-review.googlesource.com/9897 Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Ravi Mistry <rmistry@google.com>
* Roll Recipe DEPSGravatar Eric Boren2017-03-20
| | | | | | | | | | | Backing up from https://skia-review.googlesource.com/c/9884 due to failures. BUG=skia: Change-Id: I12182044191f5df56518f355262bbf83f8c5c1f8 Reviewed-on: https://skia-review.googlesource.com/9895 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
* Fix expected extension for CIPD on WindowsGravatar Brian Osman2017-03-20
| | | | | | | | | | | New depot_tools copy is a batch file BUG=skia: Change-Id: Id1497f7f7d7d93600fbfbf5991f7582380781ae8 Reviewed-on: https://skia-review.googlesource.com/9896 Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
* Remove SkImage::MakeTextureFromPixmapGravatar Brian Osman2017-03-20
| | | | | | | | | | | | | | Slight variation on https://skia-review.googlesource.com/c/7346/, which had to be reverted. This version also changes the non-mip upload path to use a GrTextureProxy. Hopefully this doesn't trigger the same perf regression that we saw last time. BUG=skia: Change-Id: Ic99bdd93904089942fb680c3af9c4c36310074c0 Reviewed-on: https://skia-review.googlesource.com/9892 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
* Switch 16 sample gpu configs to 8 samplesGravatar Brian Salomon2017-03-20
| | | | | | | | | | BUG=skia: Change-Id: I053cce7c05c74860cbace00cd94ea4b96e9a482c Reviewed-on: https://skia-review.googlesource.com/9889 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
* Enable CIPD automatic GCE authentication and fix upload_skps.pyGravatar Ravi Mistry2017-03-20
| | | | | | | | | BUG=skia:6385 Change-Id: I4bb278f99eb3131138a37b7f8752ef404766811e Reviewed-on: https://skia-review.googlesource.com/9824 Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Ravi Mistry <rmistry@google.com>
* Fix discardable memory bot by calling lockPixels()Gravatar Matt Sarett2017-03-20
| | | | | | | | | | | CQ_INCLUDE_TRYBOTS=skia.primary:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE BUG=skia: Change-Id: I684226544f0e1f0234257ba88f6f2e56c32d5706 Reviewed-on: https://skia-review.googlesource.com/9783 Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Matt Sarett <msarett@google.com>
* Eager or Lazy evaluation of sub-drawings for SkDeferredCanvas.Gravatar Herb Derby2017-03-20
| | | | | | | | | | | | | | | | | Allow evaluation choice of Lazy or Eager evaluation for SkDeferredCanvas. Eager is used for drawing to a non-recording canvas to reduce the number of all operations. Lazy is used for drawing to a recording canvas to reduce the amount decode/encode that happens. R=reed@google.com Change-Id: I7837c4f6e5911c153e0796162e1170edbc34839e Reviewed-on: https://skia-review.googlesource.com/9839 Commit-Queue: Herb Derby <herb@google.com> Reviewed-by: Mike Reed <reed@google.com>
* Widen nondetmerministic testing of processors to all Ubuntu botsGravatar Brian Osman2017-03-20
| | | | | | | | | BUG=skia:6395 Change-Id: Ieca04f9e5ce534dc7e2be9c867907d5fa0b70a15 Reviewed-on: https://skia-review.googlesource.com/9890 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
* Move SkOSFile.h to src/coreGravatar Ben Wagner2017-03-20
| | | | | | | | | | | Skia needs implementations (ports) of the declarations in this header, but no one outside of Skia the library should use them. Change-Id: I1b92eca787a61892d7b3c0ac8c5996774429ae24 Reviewed-on: https://skia-review.googlesource.com/9878 Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Mike Reed <reed@google.com> Reviewed-by: Leon Scroggins <scroggo@google.com>
* Omit hanging/failing tests on AMD Vulkan.Gravatar Ben Wagner2017-03-20
| | | | | | | | | | BUG=skia:6396 NOTRY=true Change-Id: Ib438c803aae01a3ec109d8c7416b3c5ab32a5aa5 Reviewed-on: https://skia-review.googlesource.com/9868 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Ben Wagner <benjaminwagner@google.com>
* SkData::MakeFromFD to pass size to release proc.Gravatar Ben Wagner2017-03-20
| | | | | | | | | | | | | | 6b7f34e34cc0ce397ce5e4ddc0c244f372b4f840 "simplify release-proc for SkData, removing unneeded size param" updated SkData::MakeFromFILE to pass the size of the mmap to the release proc, but did not update SkData::MakeFromFD. Change-Id: I093fff78f06818a946053df7158302664edfee0e Reviewed-on: https://skia-review.googlesource.com/9876 Reviewed-by: Mike Klein <mtklein@chromium.org> Reviewed-by: Mike Reed <reed@google.com> Reviewed-by: Leon Scroggins <scroggo@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
* Revert "remove unused SkMeshUtils and SkBoundaryPatch"Gravatar Stephan Altmueller2017-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5e21e0991968271ee37f446de7e08620ad1b50bb. Reason for revert: Breaks Pdfium build see: https://chromium-swarm.appspot.com/task?id=3504e60d4bc10810&refresh=10 Original change's description: > remove unused SkMeshUtils and SkBoundaryPatch > > BUG=skia:6366 > > Change-Id: Ibacd397e0a246dbeefde074c98712ada3848a7b6 > Reviewed-on: https://skia-review.googlesource.com/9852 > Reviewed-by: Mike Reed <reed@google.com> > Commit-Queue: Mike Reed <reed@google.com> > TBR=djsollen@google.com,reed@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:6366 Change-Id: I2403bae0a17bce8eeec743c6f433bb51b214e669 Reviewed-on: https://skia-review.googlesource.com/9891 Reviewed-by: Stephan Altmueller <stephana@google.com> Commit-Queue: Stephan Altmueller <stephana@google.com>
* GetResourceAsData to use SkData::MakeFromFileName directly.Gravatar Ben Wagner2017-03-20
| | | | | | | | | | The current code creates an SkFILEStream and then reads all the bytes from it into an SkData. Instead, let the SkData just mmap the file. Change-Id: I79e3550a84e6f54ccbbd7284f5cda81ce1fa9221 Reviewed-on: https://skia-review.googlesource.com/9877 Reviewed-by: Leon Scroggins <scroggo@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
* remove unsupported flagGravatar Mike Reed2017-03-20
| | | | | | | | | BUG=skia: Change-Id: I9483dd5ec9f53639d6b78cf864bfdff4d5c9a9b4 Reviewed-on: https://skia-review.googlesource.com/9886 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
* Remove budgeted parameter from SkSurface::makeImageSnapshot (take 2)Gravatar Robert Phillips2017-03-20
| | | | | | | | | | | | | This unused feature complicates MDB. Chrome compiles locally for me with this CL. frameworks/base/libs/hwui compiles locally for me with this CL. Change-Id: Id3ad64dac72eace52855896df0d7ce3679f15884 Reviewed-on: https://skia-review.googlesource.com/9882 Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
* Remove gpu configs that don't have explicit API.Gravatar Brian Salomon2017-03-20
| | | | | | | | | DOCS_PREVIEW= https://skia.org/?cl=9871 Change-Id: I510473cf91d8bee38d1e33424b1ae7b30dc86968 Reviewed-on: https://skia-review.googlesource.com/9871 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
* remove unused SkMeshUtils and SkBoundaryPatchGravatar Mike Reed2017-03-20
| | | | | | | | | BUG=skia:6366 Change-Id: Ibacd397e0a246dbeefde074c98712ada3848a7b6 Reviewed-on: https://skia-review.googlesource.com/9852 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
* remove legacy vertices virtual from SkDeviceGravatar Mike Reed2017-03-19
| | | | | | | | | BUG=skia:6366 Change-Id: I9fb49538f358343a7c2e4541d0044d961ac1b54d Reviewed-on: https://skia-review.googlesource.com/9870 Commit-Queue: Mike Reed <reed@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
* Revert "Revert "Add color spin test for SkColorSpaceXformCanvas""Gravatar Mike Klein2017-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 73e21af21390c2806eb1350253233903808edd6b. Reason for revert: I will fix the broken bot next week. Original change's description: > Revert "Add color spin test for SkColorSpaceXformCanvas" > > This reverts commit cb01aec63bcb3dee52afcf3605bcd64166b873c0. > > Reason for revert: Breaks Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE > > Original change's description: > > Add color spin test for SkColorSpaceXformCanvas > > > > Also changes behavior to treat nullptr srcs as sRGB. > > > > Testing locally, it looks like 353 gms have no diffs from 8888. > > There are 269 diffs - some are fine (gms that do color space stuff) > > and some are bugs. > > > > BUG=skia: > > > > Change-Id: I55c2825f4f4b857e0b0a0ec050c6db82ac881492 > > Reviewed-on: https://skia-review.googlesource.com/9738 > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: Matt Sarett <msarett@google.com> > > > > TBR=mtklein@google.com,msarett@google.com,brianosman@google.com,reviews@skia.org > # Not skipping CQ checks because original CL landed > 1 day ago. > BUG=skia: > > Change-Id: I70bb69f747b863d267494e37a60888a51ab0184c > Reviewed-on: https://skia-review.googlesource.com/9823 > Reviewed-by: Eric Boren <borenet@google.com> > Commit-Queue: Eric Boren <borenet@google.com> > TBR=borenet@google.com,mtklein@google.com,msarett@google.com,reviews@skia.org,brianosman@google.com # Not skipping CQ checks because original CL landed > 1 day ago. BUG=skia: Change-Id: I766382e6655f614042cded84f547f9fd5b109fca Reviewed-on: https://skia-review.googlesource.com/9879 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
* remov patheffect flag from google3Gravatar Mike Reed2017-03-18
| | | | | | | | | | BUG=skia: Change-Id: Iceae8d1ed0a8a8ba4021dd114ff436f5df6905c6 NOTRY=True Reviewed-on: https://skia-review.googlesource.com/9851 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
* Revert "Revert "Revert "Remove budgeted parameter from ↵Gravatar Yuqian Li2017-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SkSurface::makeImageSnapshot""" This reverts commit 31249bb2df023868e4585f14519bf17c835f8700. Reason for revert: Android build is still broken as shown below. out/target/product/bullhead/obj/NATIVE_TESTS/hwui_unit_tests_intermediates/tests/unit/SkiaPipelineTests.o frameworks/base/libs/hwui/tests/unit/SkiaPipelineTests.cpp" frameworks/base/libs/hwui/tests/unit/SkiaPipelineTests.cpp:211:51: error: non-virtual member function marked 'override' hides virtual member function sk_sp<SkImage> onNewImageSnapshot(SkBudgeted) override { ^ external/skia/src/image/SkSurface_Base.h:46:28: note: hidden overloaded virtual function 'SkSurface_Base::onNewImageSnapshot' declared here: different number of parameters (0 vs 1) virtual sk_sp<SkImage> onNewImageSnapshot() = 0; ^ frameworks/base/libs/hwui/tests/unit/SkiaPipelineTests.cpp:281:84: error: no viable conversion from 'sk_sp<DeferLayer<DeferTestCanvas>>' to 'sk_sp<SkSurface>' pipeline->renderFrame(layerUpdateQueue, dirty, nodes, true, contentDrawBounds, surface); ^~~~~~~ external/skia/include/core/SkRefCnt.h:253:15: note: candidate constructor not viable: no known conversion from 'sk_sp<DeferLayer<DeferTestCanvas> >' to 'std::nullptr_t' (aka 'nullptr_t') for 1st argument constexpr sk_sp(std::nullptr_t) : fPtr(nullptr) {} ^ external/skia/include/core/SkRefCnt.h:259:5: note: candidate constructor not viable: no known conversion from 'sk_sp<DeferLayer<DeferTestCanvas> >' to 'const sk_sp<SkSurface> &' for 1st argument sk_sp(const sk_sp<T>& that) : fPtr(SkSafeRef(that.get())) {} ^ external/skia/include/core/SkRefCnt.h:268:5: note: candidate constructor not viable: no known conversion from 'sk_sp<DeferLayer<DeferTestCanvas> >' to 'sk_sp<SkSurface> &&' for 1st argument sk_sp(sk_sp<T>&& that) : fPtr(that.release()) {} ^ external/skia/include/gpu/../private/SkTLogic.h:27:82: note: candidate template ignored: disabled by 'enable_if' [with U = (anonymous namespace)::DeferLayer<DeferTestCanvas>] template <bool B, typename T = void> using enable_if_t = typename std::enable_if<B, T>::type; ^ external/skia/include/gpu/../private/SkTLogic.h:27:82: note: candidate template ignored: disabled by 'enable_if' [with U = (anonymous namespace)::DeferLayer<DeferTestCanvas>] external/skia/include/core/SkRefCnt.h:327:5: note: candidate function operator unspecified_bool_type() const { return this->get() ? &sk_sp::fPtr : nullptr; } ^ frameworks/base/libs/hwui/pipeline/skia/SkiaPipeline.h:50:30: note: passing argument to parameter 'surface' here sk_sp<SkSurface> surface); ^ frameworks/base/libs/hwui/tests/unit/SkiaPipelineTests.cpp:312:58: error: no viable conversion from 'sk_sp<DeferLayer<ClippedTestCanvas>>' to 'sk_sp<SkSurface>' SkRect::MakeWH(CANVAS_WIDTH, CANVAS_HEIGHT), surface); ^~~~~~~ external/skia/include/core/SkRefCnt.h:253:15: note: candidate constructor not viable: no known conversion from 'sk_sp<DeferLayer<ClippedTestCanvas> >' to 'std::nullptr_t' (aka 'nullptr_t') for 1st argument constexpr sk_sp(std::nullptr_t) : fPtr(nullptr) {} ^ external/skia/include/core/SkRefCnt.h:259:5: note: candidate constructor not viable: no known conversion from 'sk_sp<DeferLayer<ClippedTestCanvas> >' to 'const sk_sp<SkSurface> &' for 1st argument sk_sp(const sk_sp<T>& that) : fPtr(SkSafeRef(that.get())) {} ^ external/skia/include/core/SkRefCnt.h:268:5: note: candidate constructor not viable: no known conversion from 'sk_sp<DeferLayer<ClippedTestCanvas> >' to 'sk_sp<SkSurface> &&' for 1st argument sk_sp(sk_sp<T>&& that) : fPtr(that.release()) {} ^ external/skia/include/gpu/../private/SkTLogic.h:27:82: note: candidate template ignored: disabled by 'enable_if' [with U = (anonymous namespace)::DeferLayer<ClippedTestCanvas>] template <bool B, typename T = void> using enable_if_t = typename std::enable_if<B, T>::type; ^ external/skia/include/gpu/../private/SkTLogic.h:27:82: note: candidate template ignored: disabled by 'enable_if' [with U = (anonymous namespace)::DeferLayer<ClippedTestCanvas>] external/skia/include/core/SkRefCnt.h:327:5: note: candidate function operator unspecified_bool_type() const { return this->get() ? &sk_sp::fPtr : nullptr; } ^ frameworks/base/libs/hwui/pipeline/skia/SkiaPipeline.h:50:30: note: passing argument to parameter 'surface' here sk_sp<SkSurface> surface); ^ frameworks/base/libs/hwui/tests/unit/SkiaPipelineTests.cpp:343:58: error: no viable conversion from 'sk_sp<DeferLayer<ClipReplaceTestCanvas>>' to 'sk_sp<SkSurface>' SkRect::MakeWH(CANVAS_WIDTH, CANVAS_HEIGHT), surface); ^~~~~~~ external/skia/include/core/SkRefCnt.h:253:15: note: candidate constructor not viable: no known conversion from 'sk_sp<DeferLayer<ClipReplaceTestCanvas> >' to 'std::nullptr_t' (aka 'nullptr_t') for 1st argument constexpr sk_sp(std::nullptr_t) : fPtr(nullptr) {} ^ external/skia/include/core/SkRefCnt.h:259:5: note: candidate constructor not viable: no known conversion from 'sk_sp<DeferLayer<ClipReplaceTestCanvas> >' to 'const sk_sp<SkSurface> &' for 1st argument sk_sp(const sk_sp<T>& that) : fPtr(SkSafeRef(that.get())) {} ^ external/skia/include/core/SkRefCnt.h:268:5: note: candidate constructor not viable: no known conversion from 'sk_sp<DeferLayer<ClipReplaceTestCanvas> >' to 'sk_sp<SkSurface> &&' for 1st argument sk_sp(sk_sp<T>&& that) : fPtr(that.release()) {} ^ external/skia/include/gpu/../private/SkTLogic.h:27:82: note: candidate template ignored: disabled by 'enable_if' [with U = (anonymous namespace)::DeferLayer<ClipReplaceTestCanvas>] template <bool B, typename T = void> using enable_if_t = typename std::enable_if<B, T>::type; ^ external/skia/include/gpu/../private/SkTLogic.h:27:82: note: candidate template ignored: disabled by 'enable_if' [with U = (anonymous namespace)::DeferLayer<ClipReplaceTestCanvas>] external/skia/include/core/SkRefCnt.h:327:5: note: candidate function operator unspecified_bool_type() const { return this->get() ? &sk_sp::fPtr : nullptr; } ^ frameworks/base/libs/hwui/pipeline/skia/SkiaPipeline.h:50:30: note: passing argument to parameter 'surface' here sk_sp<SkSurface> surface); ^ frameworks/base/libs/hwui/tests/unit/SkiaPipelineTests.cpp:214:42: error: cannot initialize object parameter of type 'SkSurface' with an expression of type '(anonymous namespace)::DeferLayer<DeferTestCanvas>' T* canvas() { return static_cast<T*>(getCanvas()); } ^~~~~~~~~ frameworks/base/libs/hwui/tests/unit/SkiaPipelineTests.cpp:282:27: note: in instantiation of member function '(anonymous namespace)::DeferLayer<DeferTestCanvas>::canvas' requested here EXPECT_EQ(4, surface->canvas()->mDrawCounter); ^ frameworks/base/libs/hwui/tests/unit/SkiaPipelineTests.cpp:214:42: error: cannot initialize object parameter of type 'SkSurface' with an expression of type '(anonymous namespace)::DeferLayer<ClippedTestCanvas>' T* canvas() { return static_cast<T*>(getCanvas()); } ^~~~~~~~~ frameworks/base/libs/hwui/tests/unit/SkiaPipelineTests.cpp:313:27: note: in instantiation of member function '(anonymous namespace)::DeferLayer<ClippedTestCanvas>::canvas' requested here EXPECT_EQ(1, surface->canvas()->mDrawCounter); ^ frameworks/base/libs/hwui/tests/unit/SkiaPipelineTests.cpp:214:42: error: cannot initialize object parameter of type 'SkSurface' with an expression of type '(anonymous namespace)::DeferLayer<ClipReplaceTestCanvas>' T* canvas() { return static_cast<T*>(getCanvas()); } ^~~~~~~~~ frameworks/base/libs/hwui/tests/unit/SkiaPipelineTests.cpp:344:27: note: in instantiation of member function '(anonymous namespace)::DeferLayer<ClipReplaceTestCanvas>::canvas' requested here EXPECT_EQ(1, surface->canvas()->mDrawCounter); Original change's description: > Revert "Revert "Remove budgeted parameter from SkSurface::makeImageSnapshot"" > > This reverts commit 9e9188f84b15a25e27f63d5f8de3ccd393d9a173. > > Reason for revert: Android-side fix has landed > > Original change's description: > > Revert "Remove budgeted parameter from SkSurface::makeImageSnapshot" > > > > This reverts commit b64bcbdc3a5aa7b9e3ff216e4617ddc1db9260b5. > > > > Reason for revert: > > > > Android build failed as shown below. > > > > frameworks/base/libs/hwui/VkLayer.cpp:32:41: error: too many arguments to function call, expected 0, have 1 > > mImage = surface->makeImageSnapshot(SkBudgeted::kNo); > > > > Original change's description: > > > Remove budgeted parameter from SkSurface::makeImageSnapshot > > > > > > This unused feature complicates MDB. > > > > > > Chrome compiles locally for me with this CL. > > > > > > Change-Id: I611e464885fb984030eace43ead42cf39d0e7f72 > > > Reviewed-on: https://skia-review.googlesource.com/9734 > > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > > Commit-Queue: Robert Phillips <robertphillips@google.com> > > > > > > > TBR=bsalomon@google.com,robertphillips@google.com,reviews@skia.org > > NOPRESUBMIT=true > > NOTREECHECKS=true > > NOTRY=true > > > > Change-Id: Iae6e313c15b2352bd0d4fc7b5629de0a51ac398e > > Reviewed-on: https://skia-review.googlesource.com/9788 > > Reviewed-by: Yuqian Li <liyuqian@google.com> > > Commit-Queue: Yuqian Li <liyuqian@google.com> > > > > TBR=bsalomon@google.com,robertphillips@google.com,reviews@skia.org,liyuqian@google.com > # Not skipping CQ checks because original CL landed > 1 day ago. > > Change-Id: If07d1b5db6e6c618d37445a0cf127780ed243a92 > Reviewed-on: https://skia-review.googlesource.com/9843 > Reviewed-by: Robert Phillips <robertphillips@google.com> > Commit-Queue: Robert Phillips <robertphillips@google.com> > TBR=bsalomon@google.com,robertphillips@google.com,reviews@skia.org,liyuqian@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I674b0a9d4130e00164d2e0344a92c373cf70f4fd Reviewed-on: https://skia-review.googlesource.com/9873 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Yuqian Li <liyuqian@google.com>
* Run 4 sample msaa configs for perf on iOSGravatar Brian Salomon2017-03-17
| | | | | | | | | | Also remove seemingly incorrect DM suppression for msaa16 on iOS. Change-Id: I3e86dc9c3c625a1b802a6edfbb9db3b708ecba4f Reviewed-on: https://skia-review.googlesource.com/9863 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
* sk_fgetsize to not use ftell.Gravatar Ben Wagner2017-03-17
| | | | | | | | | | | | | The previous version of sk_fgetsize used ftell and fseek to compute the size of a file. There are so many issues with this that it is called out by securecoding.cert.org as FIO19-C as a thing not to do. We already have correct code for computing the size of a file in the mmap code, so use that instead. Change-Id: I1d771124989d0ec1523f6d858814ee563263213a Reviewed-on: https://skia-review.googlesource.com/9860 Reviewed-by: Leon Scroggins <scroggo@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
* SkXPS: use correct drawBitmapRect logic for !bitmap.bounds().contains(*src)Gravatar Hal Canary2017-03-17
| | | | | | | Change-Id: I768b01d1a9afce99f09a0aaa793ba8ebfdefb41e Reviewed-on: https://skia-review.googlesource.com/9867 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Hal Canary <halcanary@google.com>