Derek Sollenberger [Wed, 8 Mar 2017 19:45:33 +0000 (19:45 +0000)]
Revert "Optimize mipmap downsample_2_2 in sRGB mode"
This reverts commit
3ea01f72f20d4f58bf0dcd420fa5c2724b67ac8d.
Reason for revert: triggering errors on the MSAN bots
Original change's description:
> Optimize mipmap downsample_2_2 in sRGB mode
>
> Desktop (HP z620)
> Before:
> mipmap_build_2048x2048_0_gamma 10.5 ms
> mipmap_build_2048x2048_1_gamma 77.1 ms
> After:
> mipmap_build_2048x2048_0_gamma 10.5 ms
> mipmap_build_2048x2048_1_gamma 25.1 ms
>
> Pixel XL
> Before:
> mipmap_build_2048x2048_0_gamma 160 ms
> mipmap_build_2048x2048_1_gamma 1.5 s
> After:
> mipmap_build_2048x2048_0_gamma 160 ms
> mipmap_build_2048x2048_1_gamma 313 ms
>
> Also provides marginal performance improvements
> for other sRGB downsamples.
>
> BUG=skia:
>
> Change-Id: Icfcd2ccd69676ccf3822db8042a4698e4464bb71
> Reviewed-on: https://skia-review.googlesource.com/9386
> Commit-Queue: Matt Sarett <msarett@google.com>
> Reviewed-by: Mike Klein <mtklein@chromium.org>
>
TBR=mtklein@chromium.org,mtklein@google.com,msarett@google.com,brianosman@google.com,reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Change-Id: I06907fb1691077a03daadc0980e86393bc08d9c5
Reviewed-on: https://skia-review.googlesource.com/9450
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>
Mike Reed [Wed, 8 Mar 2017 15:39:02 +0000 (10:39 -0500)]
remove SkPictureUtils.h
BUG=skia:
Change-Id: Iab6e71f347fa34baf442e38ba7773058695f3e6d
Reviewed-on: https://skia-review.googlesource.com/9348
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Kevin Lubick [Wed, 8 Mar 2017 19:01:01 +0000 (14:01 -0500)]
Add jobs for building for Chromecast
BUG=skia:6345
Change-Id: Iaf09eb7f57ae71687c6804221837a8cc8ef04931
Reviewed-on: https://skia-review.googlesource.com/9419
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Mike Klein [Wed, 8 Mar 2017 19:10:44 +0000 (19:10 +0000)]
Revert "Fix SkJumper gcc warning"
This reverts commit
e353e81a6fdf401310e0643280ec34d9de0019a3.
Reason for revert: crashing
Original change's description:
> Fix SkJumper gcc warning
>
> TBR=mtklein@google.com
>
> Change-Id: I1c3201307a1cd74a441d63d505882dc5535e150e
> Reviewed-on: https://skia-review.googlesource.com/9416
> Reviewed-by: Florin Malita <fmalita@chromium.org>
> Reviewed-by: Mike Klein <mtklein@chromium.org>
> Commit-Queue: Florin Malita <fmalita@chromium.org>
>
TBR=mtklein@chromium.org,mtklein@google.com,fmalita@chromium.org,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I937e37be90f951fbbd1307dcc334d955addfec1f
Reviewed-on: https://skia-review.googlesource.com/9446
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Mike Reed [Wed, 8 Mar 2017 18:13:44 +0000 (13:13 -0500)]
clip to elements directly, no need for replay indirection
allows us to remove SkCanvas::replayClips in future CL
BUG=skia:
Change-Id: I20c3700c8a331b4988fc1332702ff0e0565e94bc
Reviewed-on: https://skia-review.googlesource.com/9417
Reviewed-by: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Mike Klein [Wed, 8 Mar 2017 18:54:25 +0000 (18:54 +0000)]
Revert "Turn on SkJumper all the time."
This reverts commit
135555101cbde68656f028c41506113374a4026f.
Reason for revert: forgot g3, seems to break Chrome NaCl builders?
https://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Win/builds/15969/steps/compile/logs/stdio
Original change's description:
> Turn on SkJumper all the time.
>
> If the previous CL sticks, it's now easy to turn on SkJumper everywhere:
> I was mostly holding back because of build system complexity.
>
> This has the main effect of turning on SkJumper in Chromium.
> It's already been on on our local test bots and on Android framework.
>
> Change-Id: I7fbfc6aaaa7dace9c3f2cb509583c69b10997dbf
> Reviewed-on: https://skia-review.googlesource.com/9380
> Reviewed-by: Mike Klein <mtklein@chromium.org>
> Commit-Queue: Mike Klein <mtklein@chromium.org>
>
TBR=mtklein@chromium.org,herb@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I69747e9e75b2a8e3d78f6c150c9b6d6453e00632
Reviewed-on: https://skia-review.googlesource.com/9444
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Brian Osman [Wed, 8 Mar 2017 16:42:02 +0000 (11:42 -0500)]
Refactor GrColorSpaceXformHelper
Nonlinear blending mode is going to (sometimes) require additional
uniforms and shader code for color space transformation.
This change just alters the usage of the helper struct so that we can
hide any new logic (without having to change all the FPs that use it).
BUG=skia:
Change-Id: I913478a387973f5bad5aa09a29f85d21daacab94
Reviewed-on: https://skia-review.googlesource.com/9414
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Florin Malita [Wed, 8 Mar 2017 18:07:51 +0000 (13:07 -0500)]
Fix SkJumper gcc warning
TBR=mtklein@google.com
Change-Id: I1c3201307a1cd74a441d63d505882dc5535e150e
Reviewed-on: https://skia-review.googlesource.com/9416
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>
Robert Phillips [Wed, 8 Mar 2017 16:50:55 +0000 (11:50 -0500)]
Add a unique ID to GrOpLists and return it from GrRenderTargetContext::addDrawOp
This is to support the preFlush callbacks
Change-Id: I8513ea08b6516681566eceafa789b2ee7925ebce
Reviewed-on: https://skia-review.googlesource.com/9199
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Brian Salomon [Wed, 8 Mar 2017 16:38:45 +0000 (11:38 -0500)]
Make GPU dm sink correctly advertise whether it is multisampled
Change-Id: I46f1611ae6205b1db474c689b6afdc4d84fd63fd
Reviewed-on: https://skia-review.googlesource.com/9415
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Matt Sarett [Wed, 8 Mar 2017 16:31:06 +0000 (11:31 -0500)]
Add gm to compare premuls in dst vs. src color space
BUG=skia:
Change-Id: I36755f4bbc405a8af12990573e1f554df012b30a
Reviewed-on: https://skia-review.googlesource.com/9402
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Mike Reed [Wed, 8 Mar 2017 16:29:33 +0000 (11:29 -0500)]
special device for not drawing -- performs no clipping
Running nanobench clip_overhead_recording_lite
Before : 240us
After : 177us
BUG=skia:6214
Change-Id: I9ae6f9170c151798ffdc6c584a48b08cc7705d6b
Reviewed-on: https://skia-review.googlesource.com/9409
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Hal Canary [Wed, 8 Mar 2017 15:54:09 +0000 (10:54 -0500)]
bin/fetch-clang-format
Change-Id: I7deb9b49b4a3a361888a6afc07b4c6341a4b16cf
Reviewed-on: https://skia-review.googlesource.com/9410
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Hal Canary <halcanary@google.com>
Hal Canary [Wed, 8 Mar 2017 16:02:40 +0000 (11:02 -0500)]
formatting change: FuzzCanvas.cpp
Change-Id: I55345c193e6a15f650a992053d00bc42ef6a8854
Reviewed-on: https://skia-review.googlesource.com/9412
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Ben Wagner [Wed, 8 Mar 2017 15:36:31 +0000 (10:36 -0500)]
DW last resort font default name not necessary.
Currently in SkFontMgr_DirectWrite when trying to find some last resort
font SystemParametersInfoW failing is considered a fatal error and so
onLegacyCreateTypeface will return nullptr. Instead, treat failure of
getDefaultFontFamily as ignorable and continue to the default default.
BUG=chromium:697672
Change-Id: I1ea018627487fbd39b1d0eebad4c798346d09c94
Reviewed-on: https://skia-review.googlesource.com/9408
Reviewed-by: Ben Wagner <bungeman@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Hal Canary [Mon, 6 Mar 2017 21:18:49 +0000 (16:18 -0500)]
SkPDF: Always get advances at unitsPerEm.
* Work around BUG=chromium:696356
* SkTestScalerContext needs a return a em-size.
* SkPDFFont::MakeVectorCache which always produces a glyph
cache at emsize. Replaces vector_cache().
* Stop looking at fLastGlyphID and fEmSize in TypefaceMetrics.
Change-Id: I28d93b8f62d461a60fa046e9aaf7fa6d116a7ee5
Reviewed-on: https://skia-review.googlesource.com/9324
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Yuqian Li [Mon, 6 Mar 2017 22:04:58 +0000 (17:04 -0500)]
Remove SK_SUPPORT_LEGACY_AAA flag as chromium now turns it off
BUG=skia:
Change-Id: I3b385b8aeab08f402f4471637bf641cd456c8c56
Reviewed-on: https://skia-review.googlesource.com/9327
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Yuqian Li <liyuqian@google.com>
Brian Salomon [Wed, 8 Mar 2017 15:50:21 +0000 (10:50 -0500)]
Use glXCreateContextAttribsARB in viewer to make it easier to attach RenderDoc.
Change-Id: I0cc82fe826b81a082b579f60af3d9ef35d5fe351
Reviewed-on: https://skia-review.googlesource.com/9407
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Matt Sarett [Wed, 8 Mar 2017 15:22:41 +0000 (10:22 -0500)]
Rename not-fBlendCorrectly to fNonLinearBlending
No policy or behavior changes here, just a rename.
BUG=skia:
Change-Id: Ieefa5c5bbd40f25d4fef81f07b50b4057ea732b4
Reviewed-on: https://skia-review.googlesource.com/9406
Commit-Queue: Matt Sarett <msarett@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Matt Sarett [Wed, 8 Mar 2017 14:53:41 +0000 (09:53 -0500)]
Optimize mipmap downsample_2_2 in sRGB mode
Desktop (HP z620)
Before:
mipmap_build_2048x2048_0_gamma 10.5 ms
mipmap_build_2048x2048_1_gamma 77.1 ms
After:
mipmap_build_2048x2048_0_gamma 10.5 ms
mipmap_build_2048x2048_1_gamma 25.1 ms
Pixel XL
Before:
mipmap_build_2048x2048_0_gamma 160 ms
mipmap_build_2048x2048_1_gamma 1.5 s
After:
mipmap_build_2048x2048_0_gamma 160 ms
mipmap_build_2048x2048_1_gamma 313 ms
Also provides marginal performance improvements
for other sRGB downsamples.
BUG=skia:
Change-Id: Icfcd2ccd69676ccf3822db8042a4698e4464bb71
Reviewed-on: https://skia-review.googlesource.com/9386
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Mike Klein [Tue, 7 Mar 2017 15:04:05 +0000 (10:04 -0500)]
Turn on SkJumper all the time.
If the previous CL sticks, it's now easy to turn on SkJumper everywhere:
I was mostly holding back because of build system complexity.
This has the main effect of turning on SkJumper in Chromium.
It's already been on on our local test bots and on Android framework.
Change-Id: I7fbfc6aaaa7dace9c3f2cb509583c69b10997dbf
Reviewed-on: https://skia-review.googlesource.com/9380
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Florin Malita [Tue, 7 Mar 2017 21:51:57 +0000 (16:51 -0500)]
Refactor GrTextBlobCache
Instead of a single-level cache with blob-id-derived key, refactor GrTextBlobCache
as a two-level cache with a direct blob-id key (to support efficient lookup by id in
future CLs).
Change-Id: Idf29c05224faeb04919610a3935572773d5aba03
Reviewed-on: https://skia-review.googlesource.com/9400
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>
Ben Wagner [Tue, 7 Mar 2017 21:41:43 +0000 (16:41 -0500)]
Add GalaxyS6 bot.
BUG=skia:6337
NOTRY=true
Change-Id: Ibddd57c461d3a1ce62245487dfc0e4eeeba1978a
Reviewed-on: https://skia-review.googlesource.com/9397
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Hal Canary [Tue, 7 Mar 2017 21:23:20 +0000 (16:23 -0500)]
FuzzCanvas: SkColorFilter
* Also fix SkRRect generation to only make valid RRs.a
* drawDRRect only draws if outer contains inner.
* Also fix SkComposeColorFilter::toString
Change-Id: Ia75da2813555b7714663929d0ec288ae2a86d9f1
Reviewed-on: https://skia-review.googlesource.com/9399
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Hal Canary [Tue, 7 Mar 2017 20:06:29 +0000 (15:06 -0500)]
Fuzz Canvas: Remember that nextRange is inclusive.
BUG=skia:6336
Change-Id: I5ca005f8bf821d5a6f153c3df80d4c7309519cba
Reviewed-on: https://skia-review.googlesource.com/9395
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Brian Salomon [Tue, 7 Mar 2017 20:16:34 +0000 (15:16 -0500)]
Add viewer GUI options for desktop and Android to toggle instanced rendering.
BUG=skia:
Change-Id: I42674abfb7ee764f676100ac0e84cc0f07620bec
Reviewed-on: https://skia-review.googlesource.com/9396
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Mike Reed [Tue, 7 Mar 2017 19:55:37 +0000 (14:55 -0500)]
optimize intersect, use getType to utilize fast-case in preTranslate
10-15% speed up in clip_record_overhead bench
Comparing the raw fType field was missing the (maybe deprecatable) IsRectToRect
bit (0x10), which is set for identity and translate matrices, so we were
never taking the fast case.
BUG=skia:
Change-Id: I1c73f4bae42f2311454c7568ef8891239c3cae83
Reviewed-on: https://skia-review.googlesource.com/9388
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Herb Derby <herb@google.com>
Mike Klein [Tue, 7 Mar 2017 19:41:06 +0000 (14:41 -0500)]
SkJumper: constant() embeds constants directly in code
This is a potential alternative to threading around a constants struct.
I've applied it in a smattering of locations to get a feel for it.
If we like it and the performance is fine, I'll follow up with the rest.
Change-Id: Ief469e17d6da2cb94e4545ae96cf5d2604ffba88
Reviewed-on: https://skia-review.googlesource.com/9393
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Greg Daniel [Tue, 7 Mar 2017 18:37:21 +0000 (13:37 -0500)]
Control making of GrSemaphore objects inside of GrResourceProvider
This change will help us get to the point of not needing access to the GrGpu
object from GrContext.
BUG=skia:
Change-Id: Icff9815c73f1791d2ce34a4d27c57898a36f2b8f
Reviewed-on: https://skia-review.googlesource.com/9391
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Stephen White [Tue, 7 Mar 2017 19:07:18 +0000 (14:07 -0500)]
GrTessellator: convert contours to VertexLists.
This is a cleanup patch; should have no user-visible effects.
Note that contours are now returned opened, rather than closed. This
plays better with VertexList, and makes the code simpler.
BUG=skia:
Change-Id: I6a422fed0805cdca53cf0697b8427fff7cd77ad3
Reviewed-on: https://skia-review.googlesource.com/9343
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Stephen White <senorblanco@chromium.org>
Brian Osman [Tue, 7 Mar 2017 18:22:22 +0000 (13:22 -0500)]
Groundwork for nonlinear blending mode in Ganesh
Changing a bit of plumbing so we have what we need for one-off color
conversion, and fixing the logic in some of our surface validation.
Plenty more to come, want to submit this stuff in manageable chunks.
BUG=skia:6242
Change-Id: Iac9954c7cc490cc99663db4b9cdf5d6388fc39c7
Reviewed-on: https://skia-review.googlesource.com/9389
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Brian Salomon [Mon, 6 Mar 2017 21:36:49 +0000 (16:36 -0500)]
Add GrOp::wasRecorded and use in instanced rendering for tracking.
BUG=skia:
Change-Id: I4c5cdf47d42b7adae3649c7f96caabe68f45acbf
Reviewed-on: https://skia-review.googlesource.com/9308
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Mike Klein [Tue, 7 Mar 2017 17:28:11 +0000 (12:28 -0500)]
SkJumper: a couple stages used by color filters
Nothing too interesting here.
- 4x5 matrix is the same as 2x3 and 3x4, but bigger.
- luminance to alpha is pretty boring indeed.
Change-Id: I24893df15d1e22cbb500d946e1bbb58aa1522c8c
Reviewed-on: https://skia-review.googlesource.com/9385
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Herb Derby [Tue, 7 Mar 2017 16:11:47 +0000 (11:11 -0500)]
Move from SkChunkAlloc to SkArenaAlloc for PathOps
Attempt two. Remove ~SkOpContour because it is handled by the SkArenaAlloc.
Change-Id: Id3049db97aebcc1009d403a031f2fac219f58f2f
Reviewed-on: https://skia-review.googlesource.com/9381
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Herb Derby <herb@google.com>
Kevin Lubick [Tue, 7 Mar 2017 14:45:50 +0000 (09:45 -0500)]
Be able to compile nanobench for Chromecast
Get toolchain from https://goto.google.com/ncoqy and put in
$CAST_TOOLCHAIN
gn gen out/chromecast --args='cc="$CAST_TOOLCHAIN/armv7a/bin/armv7a-cros-linux-gnueabi-gcc" cxx="$CAST_TOOLCHAIN/armv7a/bin/armv7a-cros-linux-gnueabi-g++" ar="$CAST_TOOLCHAIN/armv7a/bin/armv7a-cros-linux-gnueabi-ar" is_official_build=true skia_use_fontconfig=false extra_ldflags=["-static-libstdc++","-static-libgcc"] target_cpu="arm" skia_enable_gpu=false skia_use_system_freetype2=false'
ninja -C out/chromecast nanobench
We go with is_official_build to minimize binary size, as the chromecast
does not have much onboard storage.
They do not package libstdc++ so we add the link options:
-static-libstdc++ -static-libgcc
-momit-leaf-frame-pointer is not supported, so we delete it, as it is not important.
BUG=skia:
Change-Id: I7b0882ab5d6109f07345a2d59df265efef9b9554
Reviewed-on: https://skia-review.googlesource.com/9338
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Mike Klein [Tue, 7 Mar 2017 16:27:18 +0000 (11:27 -0500)]
Remove dead links in SampleApp docs.
NOTRY=true
Change-Id: I503e413a22855301610427743912ccad1f1f8ed9
Reviewed-on: https://skia-review.googlesource.com/9384
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Mike Reed [Tue, 7 Mar 2017 14:37:29 +0000 (09:37 -0500)]
Revert[6] "Remove SkDraw from device-draw methods, and enable device-centric clipping.""""""
Previous failure was failure to detect that the clip wasn't wide-open when
optimizing for retain-vs-discard in copy-on-write. gm:copy_on_write_retain
detected this. Now fixed by adding new method to SkBaseDevice.h
This reverts commit
27d07f0acb85eea4062075dfbe9148ce12d92c66.
BUG=skia:6214
Change-Id: I532d16ec075a4525c2a550b1157bcec695dd8efd
Reviewed-on: https://skia-review.googlesource.com/9341
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>
Brian Salomon [Mon, 6 Mar 2017 21:17:12 +0000 (16:17 -0500)]
Move GrDrawOp pipeline/clip processing to GrRenderTargetContext
This is currently done in GrOpList. However, it can trigger resource creation, which in turn can trigger a flush. In the future flushing may destroy the op list.
Change-Id: I21cb1e10060bf31c95431c0511fcfff637cd6498
Reviewed-on: https://skia-review.googlesource.com/9304
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Mike Klein [Tue, 7 Mar 2017 12:59:52 +0000 (07:59 -0500)]
Back to code as data arrays, this time in .text.
This technique lets us generate a single source file, use the C++
preprocessor, and avoid the pain of working with assemblers.
By using the section attribute or declspec allocate, we can put these
data arrays into the .text section, making them ordinary code.
This is like the previous solution, except it should actually run.
CQ_INCLUDE_TRYBOTS=skia.primary:Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug,Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug,Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug,Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug
Change-Id: Ide7675f6cf32eb4831ff02906acbdc3faaeaa684
Reviewed-on: https://skia-review.googlesource.com/9336
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Brian Salomon [Tue, 7 Mar 2017 14:08:36 +0000 (09:08 -0500)]
Don't run image tests on msaa configs.
BUG=skia:6331
BUG=skia:4888
Change-Id: I8b66f4662342c2b60ddd2859146839d7cb09bbeb
Reviewed-on: https://skia-review.googlesource.com/9339
Reviewed-by: Matt Sarett <msarett@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Derek Sollenberger [Tue, 7 Mar 2017 11:14:59 +0000 (11:14 +0000)]
Revert "Move from SkChunkAlloc to SkArenaAlloc for PathOps"
This reverts commit
38c60180241e335e368fdadbf7856aff114ff668.
Reason for revert: breaking ASAN run in TAP build
Original change's description:
> Move from SkChunkAlloc to SkArenaAlloc for PathOps
>
> Change-Id: Iab111a4ebcae4e896b1fdfe285def9ef0ae2ab6b
> Reviewed-on: https://skia-review.googlesource.com/7314
> Reviewed-by: Cary Clark <caryclark@google.com>
> Commit-Queue: Herb Derby <herb@google.com>
>
TBR=herb@google.com,caryclark@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I6364254571bb1617a9f45ed08f2af4a59f9d5841
Reviewed-on: https://skia-review.googlesource.com/9335
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>
Mike Klein [Tue, 7 Mar 2017 01:02:32 +0000 (20:02 -0500)]
fix RecordOptsTest.cpp on Android framework
Change-Id: Iea45ece603cf0700860f55860b565c73088dca14
Reviewed-on: https://skia-review.googlesource.com/9333
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Mike Klein [Tue, 7 Mar 2017 00:54:47 +0000 (00:54 +0000)]
Revert "Fix new IT blocks ARMv8"
This reverts commit
90165c2269bc33ca3d6aaa73d528194daf48da4e.
Reason for revert: Skia and Chrome iOS builds broken.
../../third_party/skia/include/private/SkFixed.h:106:41: error: invalid output constraint '+t' in asm
asm("vcvt.s32.f32 %0, %0, #16": "+t"(x));
Original change's description:
> Fix new IT blocks ARMv8
>
> ARMv8 specifies that an IT block should be followed by only one 16-bit instruction.
> * SkFloatToFix is back to a C implementation that mirrors the assembly code.
>
> * S32A_D565_Opaque_neon switched the usage of the temporary 'ip' register to let
> the compiler choose what is best in the context of the IT block. And replaced
> 'keep_dst' by 'ip' where low register or high register does not matter.
>
> BUG=skia:
>
> CQ_INCLUDE_TRYBOTS=skia.primary:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD
>
> Change-Id: I096759841c972e9300c1d0293bc80d3c3ff2747b
> Reviewed-on: https://skia-review.googlesource.com/9340
> Reviewed-by: Mike Klein <mtklein@chromium.org>
> Commit-Queue: Mike Klein <mtklein@chromium.org>
>
TBR=mtklein@chromium.org,amaury.leleyzour@arm.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
CQ_INCLUDE_TRYBOTS=skia.primary:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD
Change-Id: Idbcbda88039066153e1c34233d43366ab114fd01
Reviewed-on: https://skia-review.googlesource.com/9332
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Amaury Le Leyzour [Mon, 6 Mar 2017 21:00:49 +0000 (13:00 -0800)]
Fix new IT blocks ARMv8
ARMv8 specifies that an IT block should be followed by only one 16-bit instruction.
* SkFloatToFix is back to a C implementation that mirrors the assembly code.
* S32A_D565_Opaque_neon switched the usage of the temporary 'ip' register to let
the compiler choose what is best in the context of the IT block. And replaced
'keep_dst' by 'ip' where low register or high register does not matter.
BUG=skia:
CQ_INCLUDE_TRYBOTS=skia.primary:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD
Change-Id: I096759841c972e9300c1d0293bc80d3c3ff2747b
Reviewed-on: https://skia-review.googlesource.com/9340
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Mike Reed [Mon, 6 Mar 2017 21:37:07 +0000 (16:37 -0500)]
add test for copy-on-write optimization
exercises a bug in the device-clip CL (hopefully to land soon)
BUG=skia:
Change-Id: I5a740280e1a3d6a4634338d04d9f1a1f9dc84dbb
Reviewed-on: https://skia-review.googlesource.com/9325
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>
Brian Osman [Mon, 6 Mar 2017 21:16:15 +0000 (16:16 -0500)]
Add half-float mipmap benchmarks too
Just trying to get better perf coverage of our mipmapping code, in
anticipation of different optimization strategies for the sRGB case.
I want to have some good reference points to measure progress.
BUG=skia:
Change-Id: I62e2d025fdcf9f12e6c86658c6ce7320f14fcc6f
Reviewed-on: https://skia-review.googlesource.com/9323
Reviewed-by: Matt Sarett <msarett@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Mike Reed [Mon, 6 Mar 2017 19:14:09 +0000 (14:14 -0500)]
bench clip overhead during recording
BUG=skia:
Change-Id: I739c5a7f44380e1218627b1b6430a03950ae84aa
Reviewed-on: https://skia-review.googlesource.com/9309
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Yuqian Li [Mon, 6 Mar 2017 20:47:09 +0000 (15:47 -0500)]
Turn off savelayer optimization for Android framework
This is a simpler version of https://skia-review.googlesource.com/c/8970/
Note that we couldn't do the optimization and add back the clip effect by
another clipRect or clipPath call because the final matrix is not available at
recording time.
BUG=skia:6334
Change-Id: I3ca091bdc1ee1d265a79fb88d0a6f9afe2b27e58
Reviewed-on: https://skia-review.googlesource.com/9311
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Yuqian Li <liyuqian@google.com>
Ben Wagner [Mon, 6 Mar 2017 21:01:53 +0000 (16:01 -0500)]
Remove Win10 IntelHD405 bots.
We are still testing IntelHD405 on Ubuntu16.
There are no interesting differences in gms between Braswell
(IntelHD405) and Broadwell (IntelIris6100).
Perf results are obviously worse for the slower chip, but the results
seem to track fairly well between these two bot flavors.
BUG=skia:6324
NOTRY=true
Change-Id: I326e620a64c9920ffe9c6ac24948fe78422472ce
Reviewed-on: https://skia-review.googlesource.com/9321
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Ben Wagner [Mon, 6 Mar 2017 18:33:03 +0000 (13:33 -0500)]
Omit abnormal.wbmp on Linux IntelHD405.
BUG=skia:6331
Change-Id: Id3ac102174c45b623dc2b071070b230954b901a2
Reviewed-on: https://skia-review.googlesource.com/9305
Reviewed-by: Matt Sarett <msarett@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Eric Boren [Mon, 6 Mar 2017 18:42:01 +0000 (13:42 -0500)]
Roll Recipe DEPS
BUG=skia:
Change-Id: I942ebebcb299440202b7fde205db3b9025401ae3
Reviewed-on: https://skia-review.googlesource.com/9285
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
Herb Derby [Wed, 1 Mar 2017 21:48:12 +0000 (16:48 -0500)]
Move from SkChunkAlloc to SkArenaAlloc for PathOps
Change-Id: Iab111a4ebcae4e896b1fdfe285def9ef0ae2ab6b
Reviewed-on: https://skia-review.googlesource.com/7314
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Herb Derby <herb@google.com>
Brian Osman [Mon, 6 Mar 2017 18:58:54 +0000 (13:58 -0500)]
Add bench for odd-sized mipmapping w/sRGB filtering
Need some data to inform a decision about always doing gamma correct
mipmapping.
BUG=skia:
Change-Id: I92fd120413aae3d946252b0b7122c36bc74f58da
Reviewed-on: https://skia-review.googlesource.com/9307
Commit-Queue: Matt Sarett <msarett@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Matt Sarett <msarett@google.com>
Mike Klein [Mon, 6 Mar 2017 15:00:31 +0000 (10:00 -0500)]
Update bots to NDK r14.
CQ_INCLUDE_TRYBOTS=skia.primary:Build-Mac-Clang-arm64-Debug-Android,Build-Ubuntu-Clang-arm-Debug-Android,Build-Ubuntu-Clang-arm64-Debug-Android,Build-Ubuntu-Clang-mips64el-Debug-Android,Build-Ubuntu-Clang-mipsel-Debug-Android,Build-Ubuntu-Clang-x64-Debug-Android,Build-Ubuntu-Clang-x86-Debug-Android,Build-Win-Clang-arm64-Release-Android
Change-Id: I31df35c3d73b80f465cc063f2a1a7a526172cd67
Reviewed-on: https://skia-review.googlesource.com/9293
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Brian Salomon [Mon, 6 Mar 2017 17:02:34 +0000 (12:02 -0500)]
Store clipped bounds on GrOp rather than in parallel in GrRenderTargetOpList.
When the op is recorded we update its bounds to incorporate both clipping and aa bloat.
Change-Id: Ia205e058ebeda5fcdb2cd5e9b8a30a4972672b14
Reviewed-on: https://skia-review.googlesource.com/9233
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Derek Sollenberger [Fri, 3 Mar 2017 20:48:33 +0000 (15:48 -0500)]
Add ability to insert systrace markers for the android framework
Change-Id: I34cee8382b73f1d95fde279377f976ebad6983a7
Reviewed-on: https://skia-review.googlesource.com/9232
Reviewed-by: Leon Scroggins <scroggo@google.com>
Reviewed-by: Stan Iliev <stani@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>
Matt Sarett [Mon, 6 Mar 2017 16:11:23 +0000 (11:11 -0500)]
Add SkColorSpace::isSRGB()
BUG=skia:
Change-Id: I124480a15e0c3cb01f4e22397c0a116f2d1c0d7d
Reviewed-on: https://skia-review.googlesource.com/9239
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Matt Sarett <msarett@google.com>
Brian Osman [Mon, 6 Mar 2017 16:47:26 +0000 (11:47 -0500)]
Add legacy++ to viewer (sRGB w/nonlinear blending)
BUG=skia:6242
Change-Id: I696de8eac61aebaf5cb07d8874bde3c7bd470277
Reviewed-on: https://skia-review.googlesource.com/9299
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Ben Wagner [Mon, 6 Mar 2017 16:10:54 +0000 (11:10 -0500)]
Rename PentiumN3700 to IntelHD405.
BUG=skia:6324
NOTRY=true
Change-Id: I64d87d40c85f1e3a1b2c5aee8d5d68fca81192d6
Reviewed-on: https://skia-review.googlesource.com/9301
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Brian Salomon [Mon, 6 Mar 2017 16:29:48 +0000 (11:29 -0500)]
Remove PLS path renderer
Change-Id: Ib727b0749a5a7da95832970e79804417e8b6a247
Reviewed-on: https://skia-review.googlesource.com/9300
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Matt Sarett [Mon, 6 Mar 2017 15:28:24 +0000 (10:28 -0500)]
Add unit tests for SkImage::colorSpace()
BUG=skia:
Change-Id: I1cb4bd1b5ca02f37bd08679803cf645b4d5ecc00
Reviewed-on: https://skia-review.googlesource.com/9297
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>
Hal Canary [Mon, 6 Mar 2017 13:30:44 +0000 (08:30 -0500)]
FuzzCanvas: fix BUG=skia:6321
Change-Id: I979b85cbe1eadca667d5d622bbbe24749da7b770
Reviewed-on: https://skia-review.googlesource.com/9289
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Eric Boren [Mon, 6 Mar 2017 15:00:04 +0000 (10:00 -0500)]
Roll Recipe DEPS
Bisect remaining commits...
BUG=skia:
Change-Id: I0bf8cfdcc60bc1a52ff12554d883e0a37537962e
Reviewed-on: https://skia-review.googlesource.com/9292
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Hal Canary [Mon, 6 Mar 2017 15:32:54 +0000 (10:32 -0500)]
Documentation: fix width
NOTRY=true
Change-Id: I60861019cc19537eaff000dec15b4ecbea54e915
Reviewed-on: https://skia-review.googlesource.com/9298
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Hal Canary <halcanary@google.com>
Hal Canary [Thu, 2 Mar 2017 20:14:07 +0000 (15:14 -0500)]
Documentation: ASAN, MSAN, and TSAN
NOTRY=true
Change-Id: I7ed212047a60d323e2e98470fc1eed454d333958
Reviewed-on: https://skia-review.googlesource.com/9170
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Matt Sarett [Mon, 6 Mar 2017 14:11:54 +0000 (09:11 -0500)]
Fix transfer function epsilon
This has never worked.
1.0f == 1.0f + FLT_MIN
BUG=skia:
Change-Id: I73c8f321ea0d13497cb74f7bd5965d5910e664d1
Reviewed-on: https://skia-review.googlesource.com/9280
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Mike Klein [Sat, 4 Mar 2017 10:39:54 +0000 (05:39 -0500)]
Support Android NDK r14.
simpleperf has moved a little since r13. To support both, remove its
copy step.
Explicitly disable the Clang integrated assembler on MIPS. It has only
understood the 'usw' (unaligned store) pseudoinstruction for about 4
months, and that won't be part of a Clang release until the upcoming
Clang 4.0. Must be that -no-integrated-as was the default in r13.
All six platforms build on my laptop with r14 now.
Will follow up with the CL that moves the bots to r14.
CQ_INCLUDE_TRYBOTS=skia.primary:Build-Mac-Clang-arm64-Debug-Android,Build-Ubuntu-Clang-arm-Debug-Android,Build-Ubuntu-Clang-arm64-Debug-Android,Build-Ubuntu-Clang-mips64el-Debug-Android,Build-Ubuntu-Clang-mipsel-Debug-Android,Build-Ubuntu-Clang-x64-Debug-Android,Build-Ubuntu-Clang-x86-Debug-Android,Build-Win-Clang-arm64-Release-Android
Change-Id: Ic00981d534613ebab8f6e7646b967493728b91d9
Reviewed-on: https://skia-review.googlesource.com/9237
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Eric Boren [Mon, 6 Mar 2017 14:06:53 +0000 (09:06 -0500)]
Roll Recipe DEPS
Just one commit:
97ab90f Reland "Make Ubuntu-14.04 the default version of Linux used when triggering Swarming tasks"
BUG=skia:
Change-Id: Ie9f37a1d1bb8326cf34123765618221b1460d6ea
Reviewed-on: https://skia-review.googlesource.com/9290
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Eric Boren [Mon, 6 Mar 2017 13:06:16 +0000 (08:06 -0500)]
Roll Recipe DEPS
BUG=skia:
Change-Id: Id93e801d1ad9df5a3ce82a4b6b2ec52e3fc2981b
Reviewed-on: https://skia-review.googlesource.com/9288
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Brian Salomon [Fri, 3 Mar 2017 19:30:15 +0000 (14:30 -0500)]
Remove XP override color.
The only use case for this was using the blend constant for LCD text. Now instead of overriding the op's color with an alpha we upload the alpha as a uniform.
This also removes two unused parameters from GrXferProcessor::getOptimizations.
Change-Id: I8268da9904a5d26649c6ae81a5705b0930893904
Reviewed-on: https://skia-review.googlesource.com/9221
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
UpdateSKPs [Sun, 5 Mar 2017 06:56:28 +0000 (06:56 +0000)]
Update SKP version
Automatic commit by the RecreateSKPs bot.
TBR=update-skps@skia.org
NO_MERGE_BUILDS
Change-Id: Ib8566fa97db3c8659f4396a415bd4cd14b7310ce
Reviewed-on: https://skia-review.googlesource.com/9246
Reviewed-by: update-skps <update-skps@skia.org>
Commit-Queue: update-skps <update-skps@skia.org>
Matt Sarett [Sat, 4 Mar 2017 19:49:05 +0000 (14:49 -0500)]
Delete yasm config files
These aren't currently being used.
Our clients typically compile libjpeg-turbo themselves and use their
own yasm to build the .asm files.
For the libjpeg-turbo that we use to test, we don't compile the
.asm optimizations. Maybe we should do this... But while we don't
there is no need for the yasm config files.
BUG=skia:
Change-Id: I903a47ce444b6740b32fe8d99472c4d959058f7b
Reviewed-on: https://skia-review.googlesource.com/9238
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Mike Klein [Fri, 3 Mar 2017 16:59:27 +0000 (11:59 -0500)]
Tidy up DEPS
- Sort alphabetically and align on ':'.
- Remove yasm deps. They're unused since we switched to GN.
- Remove fetch-gn hook. git-sync-deps does this now.
- Remove comments about why DEPS are needed.
They're all pretty obvious if you grep for the dependency name.
Change-Id: Iefd1a14560f227e957a206e51db8c8ba5520f57b
Reviewed-on: https://skia-review.googlesource.com/9197
Reviewed-by: Matt Sarett <msarett@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Mike Reed [Sat, 4 Mar 2017 21:47:47 +0000 (21:47 +0000)]
Revert "Revert "Revert "Revert[2] "Remove SkDraw from device-draw methods, and enable device-centric clipping."""""
This reverts commit
025e2444c1f5a0c3cdc0bf60d1fa59941a0b5db4.
Reason for revert: layouttest failures -- need to rebase these (tiny diffs in gradients)
https://storage.googleapis.com/chromium-layout-test-archives/linux_trusty_blink_rel/6018/layout-test-results/results.html
Original change's description:
> Revert "Revert "Revert[2] "Remove SkDraw from device-draw methods, and enable device-centric clipping.""""
>
> This reverts commit
baf06bc89a0ee2ac4033281e7310f6c727faab79.
>
> Reason for revert: reland to diagnose possible g3 failure
>
> Original change's description:
> > Revert "Revert[2] "Remove SkDraw from device-draw methods, and enable device-centric clipping."""
> >
> > This reverts commit
cfaa63237b152ae216f1351207bce3ea9808814c.
> >
> > Reason for revert: speculative revert to fix Google3
> >
> > Original change's description:
> > > Revert[2] "Remove SkDraw from device-draw methods, and enable device-centric clipping.""
> > >
> > > passes new (augmented) CanvasClipType unittest
> > > fixed rasterclipstack::setnewsize
> > >
> > > This reverts commit
ea5e676a7b75600edcde3912886486004ccd7626.
> > >
> > > BUG=skia:
> > >
> > > Change-Id: I004653e0f4d01454662f8516fccab0046486f273
> > > Reviewed-on: https://skia-review.googlesource.com/9185
> > > Reviewed-by: Brian Salomon <bsalomon@google.com>
> > > Commit-Queue: Mike Reed <reed@google.com>
> > >
> >
> > TBR=bsalomon@google.com,reed@google.com,reviews@skia.org
> > NOPRESUBMIT=true
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=skia:
> >
> > Change-Id: Ibd7ee6383999f008eb6ee59c1c3f1c06a86044ea
> > Reviewed-on: https://skia-review.googlesource.com/9230
> > Reviewed-by: Cary Clark <caryclark@google.com>
> > Commit-Queue: Cary Clark <caryclark@google.com>
> >
>
> TBR=bsalomon@google.com,reviews@skia.org,caryclark@google.com,reed@google.com,mtklein@chromium.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:
>
> Change-Id: I093fa8788056be39af01191bbf3a9e5de9f73954
> Reviewed-on: https://skia-review.googlesource.com/9244
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
>
TBR=mtklein@chromium.org,bsalomon@google.com,reviews@skia.org,caryclark@google.com,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Change-Id: I58f810a8ff241dbaf3133e2fe844548fcd0fa67a
Reviewed-on: https://skia-review.googlesource.com/9245
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Matt Sarett [Thu, 2 Mar 2017 17:42:35 +0000 (12:42 -0500)]
Add SkImage::colorSpace() and SkImage::refColorSpace()
BUG=skia:
Change-Id: I31c2a2731cd70e4e5162905de0ad129516dacc6b
Reviewed-on: https://skia-review.googlesource.com/9152
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Mike Reed [Sat, 4 Mar 2017 19:43:23 +0000 (19:43 +0000)]
Revert "Revert "Revert[2] "Remove SkDraw from device-draw methods, and enable device-centric clipping.""""
This reverts commit
baf06bc89a0ee2ac4033281e7310f6c727faab79.
Reason for revert: reland to diagnose possible g3 failure
Original change's description:
> Revert "Revert[2] "Remove SkDraw from device-draw methods, and enable device-centric clipping."""
>
> This reverts commit
cfaa63237b152ae216f1351207bce3ea9808814c.
>
> Reason for revert: speculative revert to fix Google3
>
> Original change's description:
> > Revert[2] "Remove SkDraw from device-draw methods, and enable device-centric clipping.""
> >
> > passes new (augmented) CanvasClipType unittest
> > fixed rasterclipstack::setnewsize
> >
> > This reverts commit
ea5e676a7b75600edcde3912886486004ccd7626.
> >
> > BUG=skia:
> >
> > Change-Id: I004653e0f4d01454662f8516fccab0046486f273
> > Reviewed-on: https://skia-review.googlesource.com/9185
> > Reviewed-by: Brian Salomon <bsalomon@google.com>
> > Commit-Queue: Mike Reed <reed@google.com>
> >
>
> TBR=bsalomon@google.com,reed@google.com,reviews@skia.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:
>
> Change-Id: Ibd7ee6383999f008eb6ee59c1c3f1c06a86044ea
> Reviewed-on: https://skia-review.googlesource.com/9230
> Reviewed-by: Cary Clark <caryclark@google.com>
> Commit-Queue: Cary Clark <caryclark@google.com>
>
TBR=bsalomon@google.com,reviews@skia.org,caryclark@google.com,reed@google.com,mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Change-Id: I093fa8788056be39af01191bbf3a9e5de9f73954
Reviewed-on: https://skia-review.googlesource.com/9244
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Mike Reed [Sat, 4 Mar 2017 19:42:31 +0000 (19:42 +0000)]
Revert "move some of patheffect internals into private"
This reverts commit
7067fc6224833941380729857ad865547bc88430.
Reason for revert: need to update android jni
Original change's description:
> move some of patheffect internals into private
>
> BUG=skia:
>
> Change-Id: I00da9d38f16fb20f31e025dd817c5d430466a1d0
> Reviewed-on: https://skia-review.googlesource.com/9236
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
>
TBR=reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Change-Id: I3a67b5aa9660742ec73563972b57d66c205dc0d5
Reviewed-on: https://skia-review.googlesource.com/9243
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Mike Reed [Sat, 4 Mar 2017 02:57:41 +0000 (21:57 -0500)]
move some of patheffect internals into private
BUG=skia:
Change-Id: I00da9d38f16fb20f31e025dd817c5d430466a1d0
Reviewed-on: https://skia-review.googlesource.com/9236
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Brian Osman [Sat, 4 Mar 2017 13:12:46 +0000 (08:12 -0500)]
Rebase and fix chromium
Combine texture provider and resource provider
Largely mechanical. Only three places that were calling createApprox
via texture provider (ie without flags), so that was simple.
BUG=skia:
Change-Id: I876367bcdc6a8db736deedab1028de1972015509
Reviewed-on: https://skia-review.googlesource.com/9176
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Brian Salomon [Fri, 3 Mar 2017 20:07:55 +0000 (15:07 -0500)]
Remove unnecessary use of GrGLIRect in GrRenderTargetOpList
Change-Id: I47f3930a142f8958c03906a46a7245b5af8e80f7
Reviewed-on: https://skia-review.googlesource.com/9227
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Brian Salomon [Fri, 3 Mar 2017 19:37:38 +0000 (14:37 -0500)]
Remove clip to bounds GrContextOption
Change-Id: I02da998640a3dd8848426179a91a9105d1024f0e
Reviewed-on: https://skia-review.googlesource.com/9225
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Stephen White [Fri, 3 Mar 2017 17:24:16 +0000 (12:24 -0500)]
GrTessellator: Implement a fast path in poly emission.
When there's a single triangle remaining in the monotone,
emit early and skip a convexity check.
BUG=skia:
Change-Id: I591acf4b7f567dbbf7681ba72181e578ca4623ec
Reviewed-on: https://skia-review.googlesource.com/8797
Commit-Queue: Stephen White <senorblanco@chromium.org>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Ben Wagner [Fri, 3 Mar 2017 20:12:25 +0000 (15:12 -0500)]
Add Braswell bots.
BUG=skia:6324
NOTRY=true
Change-Id: I5c8b1572f839efa0a010e1cec8026c34f72cb92a
Reviewed-on: https://skia-review.googlesource.com/9229
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Herb Derby [Fri, 3 Mar 2017 20:09:43 +0000 (15:09 -0500)]
Use an exponential growth strategy for extra blocks.
Change-Id: I4137cb60b79184456aa71d18cb31a52c27bd8792
Reviewed-on: https://skia-review.googlesource.com/9260
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Herb Derby <herb@google.com>
Cary Clark [Fri, 3 Mar 2017 20:27:13 +0000 (20:27 +0000)]
Revert "Revert[2] "Remove SkDraw from device-draw methods, and enable device-centric clipping."""
This reverts commit
cfaa63237b152ae216f1351207bce3ea9808814c.
Reason for revert: speculative revert to fix Google3
Original change's description:
> Revert[2] "Remove SkDraw from device-draw methods, and enable device-centric clipping.""
>
> passes new (augmented) CanvasClipType unittest
> fixed rasterclipstack::setnewsize
>
> This reverts commit
ea5e676a7b75600edcde3912886486004ccd7626.
>
> BUG=skia:
>
> Change-Id: I004653e0f4d01454662f8516fccab0046486f273
> Reviewed-on: https://skia-review.googlesource.com/9185
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
>
TBR=bsalomon@google.com,reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Change-Id: Ibd7ee6383999f008eb6ee59c1c3f1c06a86044ea
Reviewed-on: https://skia-review.googlesource.com/9230
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Cary Clark <caryclark@google.com>
Mike Klein [Fri, 3 Mar 2017 19:05:32 +0000 (14:05 -0500)]
SkJumper: store_f32
Change-Id: I4bc6d1a8787c540fd1a29274650d34392e56651c
Reviewed-on: https://skia-review.googlesource.com/9223
Reviewed-by: Mike Klein <mtklein@chromium.org>
Joe Gregorio [Fri, 3 Mar 2017 18:57:39 +0000 (13:57 -0500)]
Upgrade Go in CIPD to 1.7.5
BUG=skia:
Change-Id: I70fadfa293387bec03a201ac986b3e1cba053ab6
Reviewed-on: https://skia-review.googlesource.com/9222
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
Reviewed-by: Cary Clark <caryclark@google.com>
Mike Reed [Fri, 3 Mar 2017 18:58:10 +0000 (13:58 -0500)]
Revert[2] "Remove SkDraw from device-draw methods, and enable device-centric clipping.""
passes new (augmented) CanvasClipType unittest
fixed rasterclipstack::setnewsize
This reverts commit
ea5e676a7b75600edcde3912886486004ccd7626.
BUG=skia:
Change-Id: I004653e0f4d01454662f8516fccab0046486f273
Reviewed-on: https://skia-review.googlesource.com/9185
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Joe Gregorio [Fri, 3 Mar 2017 18:21:26 +0000 (13:21 -0500)]
Remove extract_comments in housekeeper bot.
BUG=skia:
Change-Id: I6bd745a03c9f8c06ed711839a4bda1db0693cf5a
Reviewed-on: https://skia-review.googlesource.com/9220
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
Robert Phillips [Fri, 3 Mar 2017 16:10:18 +0000 (11:10 -0500)]
Switch SkImageGenerator over to generating GrTextureProxies
It does not seem irrational for generateTexture to always receive a valid GrContext. lockAsBitmap can do as it pleases.
This is split out of: https://skia-review.googlesource.com/c/8823/ (Remove GrFragmentProcessor-derived class' GrTexture-based ctors)
Change-Id: I8aebc813a8a3a7d694b7369c2c9810e2164fe16e
Reviewed-on: https://skia-review.googlesource.com/9191
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Cary Clark [Fri, 3 Mar 2017 17:34:15 +0000 (17:34 +0000)]
Revert "Upgrade Go in CIPD to 1.7.5"
This reverts commit
3fb5299febf37456408c81298bbf2092133cb4f3.
Reason for revert: speculative revert to see if it fixes housekeeping bot
Original change's description:
> Upgrade Go in CIPD to 1.7.5
>
> BUG=skia:
>
> Change-Id: I574c704a4c4bee90b26c1d73d17762ae8b8f55f6
> Reviewed-on: https://skia-review.googlesource.com/9192
> Commit-Queue: Joe Gregorio <jcgregorio@google.com>
> Reviewed-by: Ravi Mistry <rmistry@google.com>
>
TBR=rmistry@google.com,jcgregorio@google.com,borenet@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Change-Id: I8fe46a29d4e24d54e769ccfae210bed5d2c4037c
Reviewed-on: https://skia-review.googlesource.com/9198
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Cary Clark <caryclark@google.com>
Joe Gregorio [Fri, 3 Mar 2017 15:55:10 +0000 (10:55 -0500)]
Upgrade Go in CIPD to 1.7.5
BUG=skia:
Change-Id: I574c704a4c4bee90b26c1d73d17762ae8b8f55f6
Reviewed-on: https://skia-review.googlesource.com/9192
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
Mike Klein [Fri, 3 Mar 2017 15:55:02 +0000 (10:55 -0500)]
Put is_skia_standalone back a bit.
We do still need to know when we're in our GN environment or in another,
like Fuchsia's or Flutter's.
The places where we replaced is_skia_standalone with defined(ndk) still
look right to me as defined(ndk).
CQ_INCLUDE_TRYBOTS=skia.primary:Build-Ubuntu-GCC-x86_64-Release-Flutter_Android
Change-Id: I5455014a8f4a350ac3a939097d042fd8cb4c32fa
Reviewed-on: https://skia-review.googlesource.com/9193
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Mike Klein [Fri, 3 Mar 2017 14:21:30 +0000 (09:21 -0500)]
Strengthen is_official_build, update docs.
This makes is_official_build turn off all development targets and
features in Skia, including building third-party dependencies from
source.
This will intentionally break some external users, who will find
themselves no longer able to find third-party headers or link against
third-party libraries. These users have been building with our testing
third-party dependencies unknowingly. They'll need to either explicitly
turn back on building each dependency from source
(skia_use_system_foo=false) or disable that dependency entirely
(skia_use_foo=false).
is_skia_standalone is now basically !is_official_build, so I've
propagated that through, removing is_skia_standalone. In a few places
we were using it as a stand-in for defined(ndk), so I've just written
defined(ndk) there. Duh.
gn_to_bp:
is_offical_build's new strength also makes gn_to_bp.py simpler to
write. In spirit, Android builds are official Skia builds that also
build DM and nanobench.
It seems that SkJumper (src/jumper/*) is (unintentionally) enabled
on Android. Switching to an is_official_build would have disabled
that. But as that accidental launch seems to have gone fine, I've
kept it explicitly enabled.
In the end, no changes to Android.bp or its SkUserConfig.h.
The -Mini builder no longer needs to explicitly disable tools.
CQ_INCLUDE_TRYBOTS=skia.primary:Build-Ubuntu-Clang-x86_64-Release-Mini
Change-Id: Id06e53268a5caf55c6046ada354a0863c3031c73
Reviewed-on: https://skia-review.googlesource.com/9190
Reviewed-by: Leon Scroggins <scroggo@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Matt Sarett [Thu, 2 Mar 2017 17:07:46 +0000 (12:07 -0500)]
Use non-fatal errors for WIC decoding failures
This should fix flakiness on the Win 2k8 bots.
BUG=skia:
Change-Id: Ibdd33279a092172f0b154493f59790a8db9f58bd
Reviewed-on: https://skia-review.googlesource.com/9142
Reviewed-by: Leon Scroggins <scroggo@google.com>
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>
Hal Canary [Fri, 3 Mar 2017 13:29:18 +0000 (08:29 -0500)]
Documentation: detailed iOS
NOTRY=true
Change-Id: I24328509fc902f4f41198e249e82e88eda5dd21d
Reviewed-on: https://skia-review.googlesource.com/9189
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Hal Canary <halcanary@google.com>
Robert Phillips [Thu, 2 Mar 2017 23:18:38 +0000 (18:18 -0500)]
Make GrSurface::MakeDeferred return sk_sp<GrTextureProxy>
This should make upcoming changes less tedious
Change-Id: I313ae9df724f109a64cf5708a974e8bfeb963025
Reviewed-on: https://skia-review.googlesource.com/9183
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Mike Reed [Fri, 3 Mar 2017 01:07:46 +0000 (20:07 -0500)]
update cliptype test to exercise clipstack backend
BUG=skia:
Change-Id: Iaa54dd8d556db3cead723558e812d927376b08c0
Reviewed-on: https://skia-review.googlesource.com/9186
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Stephen White [Thu, 2 Mar 2017 21:16:33 +0000 (16:16 -0500)]
GrTessellator: add a null-check for a clusterfuzz test case.
BUG=695696
Change-Id: I1c001316721b3c042cff115c905ff0d2c2698ac0
Reviewed-on: https://skia-review.googlesource.com/9053
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Stephen White <senorblanco@chromium.org>
Ben Wagner [Thu, 2 Mar 2017 22:33:21 +0000 (17:33 -0500)]
Release resources if SkMallocPixelRef::NewWithProc fails.
Change-Id: I29b96cd9f2d2311b4caae092102f501dbc6a4fe8
Reviewed-on: https://skia-review.googlesource.com/9182
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Mike Reed <reed@google.com>