Commit Graph

29361 Commits

Author SHA1 Message Date
Robert Phillips
57aa367aa3 Add initial version of GrResourceAllocator's free pool (take 2)
TBR=bsalomon@google.com
Change-Id: I252d0d75f9ad3911abf97495f67d5178e924dd78
Reviewed-on: https://skia-review.googlesource.com/25560
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
2017-07-21 16:18:53 +00:00
Cary Clark
8825a09fc8 Revert "check for no blur and exit early"
This reverts commit 35a5e418b9.

Reason for revert: breaks google 3

Original change's description:
> check for no blur and exit early
> 
> Bug: skia:
> Change-Id: I98c07c5fd77ec67398dd4df12fb6a24aa4ca7731
> Reviewed-on: https://skia-review.googlesource.com/25567
> Commit-Queue: Mike Reed <reed@google.com>
> Reviewed-by: Mike Klein <mtklein@chromium.org>
> Reviewed-by: Florin Malita <fmalita@chromium.org>

TBR=mtklein@chromium.org,mtklein@google.com,fmalita@chromium.org,reed@google.com

Change-Id: I9c4b50bb2fda504e5c61ed03c0722abff327ca72
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/25568
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Cary Clark <caryclark@google.com>
2017-07-21 16:07:06 +00:00
Mike Reed
353196f44f clean read/write pixels signatures, augment SkSurface API
For now, not adding writePixels to surface, since it appears we may not
be able to remove writePixels from canvas :(

Bug: skia:3216
Change-Id: I64ccebb31effacffe615ae4537fb46a161a6768d
Reviewed-on: https://skia-review.googlesource.com/25562
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Mike Reed <reed@google.com>
2017-07-21 15:27:23 +00:00
Mike Reed
35a5e418b9 check for no blur and exit early
Bug: skia:
Change-Id: I98c07c5fd77ec67398dd4df12fb6a24aa4ca7731
Reviewed-on: https://skia-review.googlesource.com/25567
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Florin Malita <fmalita@chromium.org>
2017-07-21 15:18:33 +00:00
Florin Malita
15cac7296e Revert "Revert "Always use raster pipeline for radial gradients""
This reverts commit 8b8b2244c3.

Reason for revert: guard landed in g3

Original change's description:
> Revert "Always use raster pipeline for radial gradients"
> 
> This reverts commit 5a5207ae67.
> 
> Reason for revert: suspect this is the reason for Google3 roll failure.
> 
> First color mismatch. Expected ff0006f9, got ff0004fb
> Expected output mismatch apps/cereal/skia_expected/radialGradient.png (3392 pixels)
> 
> 
> Original change's description:
> > Always use raster pipeline for radial gradients
> > 
> > Change-Id: Id4c9ed45c28becf0e25ed9ff1b3380c7ca65aa4b
> > Reviewed-on: https://skia-review.googlesource.com/25363
> > Reviewed-by: Mike Klein <mtklein@chromium.org>
> > Commit-Queue: Florin Malita <fmalita@chromium.org>
> 
> TBR=mtklein@chromium.org,mtklein@google.com,fmalita@chromium.org,reed@google.com
> 
> Change-Id: I382a22f354d3c0a1465bd9c1555f226b0f1abb58
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://skia-review.googlesource.com/25441
> Reviewed-by: Mike Klein <mtklein@google.com>
> Commit-Queue: Mike Klein <mtklein@google.com>

TBR=mtklein@chromium.org,mtklein@google.com,fmalita@chromium.org,reed@google.com

Change-Id: I1a53c98735e5b344d0c2a18800ec94520f328931
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/25660
Reviewed-by: Florin Malita <fmalita@google.com>
Commit-Queue: Florin Malita <fmalita@google.com>
2017-07-21 14:55:24 +00:00
Stephan Altmueller
e86af693dc Enable verbose output on iOS and Android
Bug: skia:
Change-Id: Ia2c40b01d78257dd7e30805a034a581b708d0b90
Reviewed-on: https://skia-review.googlesource.com/25563
Commit-Queue: Stephan Altmueller <stephana@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
2017-07-21 14:43:03 +00:00
Robert Phillips
96be9df130 Revert "Reduce dependence on GrSurface's origin field"
This reverts commit 467022b186.

Reason for revert: GrAHardwareBufferImageGenerator.cpp

Original change's description:
> Reduce dependence on GrSurface's origin field
> 
> Unfortunately, GrGPU and its ilk are still using the GrSurface's origin a lot. I will clean that up in a second CL.
> 
> Change-Id: Iba729440ce8ea8d24bb7f4e5de55ed576a0f176d
> Reviewed-on: https://skia-review.googlesource.com/24700
> Commit-Queue: Robert Phillips <robertphillips@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>

TBR=bsalomon@google.com,robertphillips@google.com

Change-Id: I1b3f5c3b82d250ac164beb1d5c83abb6c3c6ab3b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/25620
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
2017-07-21 14:17:54 +00:00
Yuqian Li
7877d32378 Make update_edge as a member function of SkAnalyticEdge
This is to prepare for future SkScan_DAAPath.cpp to use this member function
(https://skia-review.googlesource.com/c/19666/).

Bug: skia:
Change-Id: I5fb90ac67b80f8a69a712e7e697d68dcadba5d14
Reviewed-on: https://skia-review.googlesource.com/24180
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Yuqian Li <liyuqian@google.com>
2017-07-21 14:17:03 +00:00
Robert Phillips
467022b186 Reduce dependence on GrSurface's origin field
Unfortunately, GrGPU and its ilk are still using the GrSurface's origin a lot. I will clean that up in a second CL.

Change-Id: Iba729440ce8ea8d24bb7f4e5de55ed576a0f176d
Reviewed-on: https://skia-review.googlesource.com/24700
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
2017-07-21 14:05:33 +00:00
Brian Osman
594838a44d Delete more event tracing macros (take 2)
Also tried to clean up the comments to be clearer.

Re-land of: https://skia-review.googlesource.com/25364, with some
macros that are used by Flutter restored.

Change-Id: I648815c275dfea2ec83a382a633af8d9f7780512
Reviewed-on: https://skia-review.googlesource.com/25561
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Brian Osman <brianosman@google.com>
2017-07-21 13:47:23 +00:00
Robert Phillips
39f1a9589b Revert "Add initial version of GrResourceAllocator's free pool"
This reverts commit 6ec9a4ffe4.

Reason for revert: Maybe breaking iOS bots

Original change's description:
> Add initial version of GrResourceAllocator's free pool
> 
> Change-Id: Ibd60303ffb1d3ea814dad0cee3a521f94da63ca8
> Reviewed-on: https://skia-review.googlesource.com/24262
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>

TBR=bsalomon@google.com,robertphillips@google.com

Change-Id: I0195f64503a6f2f7b416f75b57fb9141e5b9f796
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/25540
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
2017-07-21 12:15:14 +00:00
Brian Salomon
650ced07d9 Make GrColorFragmentProcessorAnalysis do all analysis in constructor.
We no longer do piecemeal analysis. This simplifies the change to make FPs have unique ownership.

Change-Id: I4e6b2c23b4277b612dedfc466cee74630a30e997
Reviewed-on: https://skia-review.googlesource.com/25362
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
2017-07-21 11:48:53 +00:00
Robert Phillips
6ec9a4ffe4 Add initial version of GrResourceAllocator's free pool
Change-Id: Ibd60303ffb1d3ea814dad0cee3a521f94da63ca8
Reviewed-on: https://skia-review.googlesource.com/24262
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
2017-07-21 11:37:23 +00:00
Mike Klein
8b8b2244c3 Revert "Always use raster pipeline for radial gradients"
This reverts commit 5a5207ae67.

Reason for revert: suspect this is the reason for Google3 roll failure.

First color mismatch. Expected ff0006f9, got ff0004fb
Expected output mismatch apps/cereal/skia_expected/radialGradient.png (3392 pixels)


Original change's description:
> Always use raster pipeline for radial gradients
> 
> Change-Id: Id4c9ed45c28becf0e25ed9ff1b3380c7ca65aa4b
> Reviewed-on: https://skia-review.googlesource.com/25363
> Reviewed-by: Mike Klein <mtklein@chromium.org>
> Commit-Queue: Florin Malita <fmalita@chromium.org>

TBR=mtklein@chromium.org,mtklein@google.com,fmalita@chromium.org,reed@google.com

Change-Id: I382a22f354d3c0a1465bd9c1555f226b0f1abb58
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/25441
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
2017-07-21 00:11:43 +00:00
Florin Malita
5a5207ae67 Always use raster pipeline for radial gradients
Change-Id: Id4c9ed45c28becf0e25ed9ff1b3380c7ca65aa4b
Reviewed-on: https://skia-review.googlesource.com/25363
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>
2017-07-20 22:51:02 +00:00
Mike Klein
e23e55ef33 retry explore always using SkRasterPipeline for color space transforms
Testing notes:
  $ out/dm --src colorImage --colorImages skimage/colorspace --config srgb 8888 f16
  All images identical on Trashcan.

  Had to revert before because of crashes on iOS, and image diffs
  (32-bit ARM?).

Change-Id: Ic182c0f98b1a846a351499aa53293186bb55f2ad
Original: https://skia-review.googlesource.com/c/19744/
Reviewed-on: https://skia-review.googlesource.com/20680
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
2017-07-20 22:33:52 +00:00
Mike Klein
d04598734d Revert "Delete more event tracing macros"
This reverts commit fd52317bf6.

Reason for revert: 

../../flutter/shell/common/skia_event_tracer_impl.cc:34:12: error: use of undeclared identifier 'TRACE_EVENT_PHASE_BEGIN'
      case TRACE_EVENT_PHASE_BEGIN:

:(


Original change's description:
> Delete more event tracing macros
> 
> Also tried to clean up the comments to be clearer.
> 
> Bug: skia:
> Change-Id: I9762564a7f59bbfbd6a43afe902596d25ff1d523
> Reviewed-on: https://skia-review.googlesource.com/25364
> Reviewed-by: Mike Klein <mtklein@chromium.org>
> Commit-Queue: Brian Osman <brianosman@google.com>

TBR=mtklein@chromium.org,brianosman@google.com

Change-Id: I3869991b8aa3d0d67d12fbe76a207a1167801a63
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/25440
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
2017-07-20 22:13:53 +00:00
Brian Osman
fd52317bf6 Delete more event tracing macros
Also tried to clean up the comments to be clearer.

Bug: skia:
Change-Id: I9762564a7f59bbfbd6a43afe902596d25ff1d523
Reviewed-on: https://skia-review.googlesource.com/25364
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Brian Osman <brianosman@google.com>
2017-07-20 21:20:22 +00:00
Greg Daniel
8761e0c546 Add ability to pre-initialize vulkan semaphores when flushing surfaces
Bug: skia:
Change-Id: I2d3eb68d2ac6045fe3e30350fdd21140e22861d7
Reviewed-on: https://skia-review.googlesource.com/24645
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
2017-07-20 20:59:52 +00:00
Brian Salomon
807371c15b Revert "Remove GrBackendRenderTargetDesc in favor of GrBackendRenderTarget."
This reverts commit e2d37c2a07.

Reason for revert: <INSERT REASONING HERE>

Original change's description:
> Remove GrBackendRenderTargetDesc in favor of GrBackendRenderTarget.
> 
> Also removes a reference to GrBackendTextureDesc in a comment and updates markdown docs.
> 
> Docs-Preview: https://skia.org/?cl=24861
> Bug: skia:
> Change-Id: Ic6490d5ef46953450e6dee69271397bb2b94d0d6
> Reviewed-on: https://skia-review.googlesource.com/24861
> Commit-Queue: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>

TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com

Change-Id: I4b85b529727f0bf5aec21d87e725a8195666e2e5
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/25182
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
2017-07-20 20:48:23 +00:00
Mike Klein
3b59af5bf8 override SkRasterPipelineBlitter::blitRect()
Now that we can natively do 2D blits, it's time to invert the blitH() /
blitRect() who-implements-whom relationship.  blitRect() is our more
fundamental blit.

Change-Id: Ia0ae4a3cd75c7bbfc7bd5b08ff429193ce09a73b
Reviewed-on: https://skia-review.googlesource.com/25361
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
2017-07-20 20:40:04 +00:00
Brian Salomon
e2d37c2a07 Remove GrBackendRenderTargetDesc in favor of GrBackendRenderTarget.
Also removes a reference to GrBackendTextureDesc in a comment and updates markdown docs.

Docs-Preview: https://skia.org/?cl=24861
Bug: skia:
Change-Id: Ic6490d5ef46953450e6dee69271397bb2b94d0d6
Reviewed-on: https://skia-review.googlesource.com/24861
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
2017-07-20 20:28:57 +00:00
Greg Daniel
dba7e7ccfb Add test for flushing empty surface with semaphores
Bug: skia:
Change-Id: I8d7dcb29c5b4c460aa5137842caf6563448ba5d3
Reviewed-on: https://skia-review.googlesource.com/25181
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
2017-07-20 20:26:28 +00:00
Hal Canary
c7d295ecf7 DM: excercise other SkPDF raster dpis
Change-Id: Ia50661a8391da526d509adbe2d7203866c140b1c
Reviewed-on: https://skia-review.googlesource.com/25321
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
2017-07-20 20:23:54 +00:00
Heather Miller
93d7d23a3a Update Skia milestone to 62
Bug: skia:
Change-Id: I94c906422508a75a859c7c780abf520a6083cbf8
Reviewed-on: https://skia-review.googlesource.com/25360
Reviewed-by: Heather Miller <hcm@google.com>
Commit-Queue: Heather Miller <hcm@google.com>
2017-07-20 20:21:23 +00:00
Brian Osman
53136aa93f First stab at JSON event tracer
Not yet thread safe (so it forces threading off).
Builds JSON on the fly, so overhead is certainly bad.
Plan to fix all of that, but this at least "works".

There is now one tracing flag: 'trace'.
- 'debugf' installs the SkDebugf tracer.
- 'atrace' installs the Android ATrace tracer.
- Any other value is interpreted as a filename, and
  produces a JSON file for chrome://tracing.

All three modes work in DM, nanobench, and Viewer.

Bug: skia:
Change-Id: I3fbc22382b99418a508c670be2770195c0a1c364
Reviewed-on: https://skia-review.googlesource.com/24781
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
2017-07-20 20:11:22 +00:00
Mike Klein
45c16fa82c convert over to 2d-mode
[√] convert all stages to use SkJumper_MemoryCtx / be 2d-compatible
 [√] convert compile to 2d also, remove 1d run/compile
 [√] convert all call sites
 [√] no diffs

Change-Id: I3b806eb8fe0c3ec043359616409f7cd1211a1e43
Reviewed-on: https://skia-review.googlesource.com/24263
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
2017-07-20 19:50:32 +00:00
Hal Canary
3f4671871f SkPDF: handle unsupported colortypes (e.g. F16) uniformly
Change-Id: I1a9e7a749b5be9dc552608493e23a03db9b2c5b1
Reviewed-on: https://skia-review.googlesource.com/25161
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
2017-07-20 19:10:22 +00:00
Florin Malita
2371da0731 Use raster pipeline for repeat/mirror radial gradients
(reland of https://skia-review.googlesource.com/c/24283/)

The legacy clamp specialization is still faster, but for repeat and
mirror RP wins (at low color stop counts).

Change-Id: I97a77188e912239f31e94600021b469ce7c40797
Reviewed-on: https://skia-review.googlesource.com/24742
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>
2017-07-20 18:36:52 +00:00
Eric Boren
fe40abc14b Add new Android builder which uses API_LEVEL 26
Bug: skia:6870
Change-Id: Idd9a27518c1123c0a729b4d07461047f5530aae3
Reviewed-on: https://skia-review.googlesource.com/24960
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
2017-07-20 18:25:12 +00:00
Mike Klein
f93552ba44 Target arm64-apple-ios for aarch64 stages.
This should avoid use of x18.

BUG=skia:6873

Change-Id: Iffafe0a48784b03942325517a999ad9bb44c1f99
Reviewed-on: https://skia-review.googlesource.com/25180
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
2017-07-20 17:58:22 +00:00
Hal Canary
9a0e39054c sk_sp: act as if operator bool() not implicit.
Change-Id: Icd426a162ca0c778db7b3373efcb2c546da50273
Reviewed-on: https://skia-review.googlesource.com/22543
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
2017-07-20 17:43:52 +00:00
Chris Dalton
80ace82be1 Only run GL congs on CCPR bots
Bug: skia:
Change-Id: Ief012869b740bbfb947a77c91c4478a851f2517e
Reviewed-on: https://skia-review.googlesource.com/25062
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-07-20 17:39:52 +00:00
Mike Klein
0fddb2d7c1 Retry cleaning up SkLinearBitmapPipeline.
This is mostly dead code.

In order to make it truly dead, we need to opt drawing unpremul images
into SkRasterPipelineBlitter.  They had been handled by
SkLinearBitmapPipeline, but can't be draw by SkBitmapProcLegacyShader.

Drawing unpremul images is tested by the GM all_variants_8888, which
gave us trouble last time around (serialize-8888 drew right, 8888 wrong)
but now draws fine.  I think this was probably also the root of the
revert, drawing some unpremul image in Chrome's tests somewhere.

Change-Id: I453f9df44ade807316935921cbae82961e2f08aa
Reviewed-on: https://skia-review.googlesource.com/24862
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
2017-07-20 16:45:52 +00:00
Derek Sollenberger
edfe3dfb47 Add option to ignore SIGINT when running DM on Android.
Bug: skia:6856
Change-Id: Iaaad2c22988cf8058304b7396c7d24eacd2f3edb
Reviewed-on: https://skia-review.googlesource.com/24745
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>
2017-07-20 16:28:06 +00:00
Hal Canary
f0f4c0c6d5 SkPDF: Support alpha-only images with maskfilters
- Handle alpha-only images with maskfilters
  - No longer apply color-filter to alpha-only images (it should apply
    to the paint color/shader composed with the alpha image instead).
  - Alpha-only images without maskfilters do sub-pixel clipping.
  - Non-alpha-only drawImages with maskfilters do sub-pixel clipping.

  * Fixes `alpha_image` GM (output now matches GPU backend).
  * Improves GMs `imagemasksubset` and `shadows`.

BUG=skia:6735

Change-Id: I62a82b4133ae0eb42d6315785bc3d2cb834bd352
Reviewed-on: https://skia-review.googlesource.com/24820
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
2017-07-20 16:23:03 +00:00
Hal Canary
fa486cf4de SkDocument.cpp clean up
Change-Id: I125a773e29824cfdd60754e681182d37e828c4b9
Reviewed-on: https://skia-review.googlesource.com/24860
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
2017-07-20 16:23:02 +00:00
Leon Scroggins III
af1813e3bf Update call to new signature of wrapBackendTexture
d17f6584df dropped flags and sampleCount,
and GrBackendTextureFlags itself. Drop these here to fix the Android
build.

Change-Id: I44e65b8eba79d8d2a9db9f64b2323f2ba006a8eb
Reviewed-on: https://skia-review.googlesource.com/24866
Commit-Queue: Leon Scroggins <scroggo@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
2017-07-20 13:40:49 +00:00
Greg Daniel
d62f5541f2 Fix WrappedProxyTest for sample count change
Bug: skia:
Change-Id: I3c131cf253512f7e91558792ecb6c6a6ce0a8e9c
Reviewed-on: https://skia-review.googlesource.com/24865
Reviewed-by: Greg Daniel <egdaniel@google.com>
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
2017-07-20 13:38:12 +00:00
Greg Daniel
2bb6ecc112 Revert "Revert "Fixes from sample count change""
This reverts commit 914b285d45.

Reason for revert: Already have fix for bug, which is quicker than fixing merge conflict

Original change's description:
> Revert "Fixes from sample count change"
> 
> This reverts commit f3316224b9.
> 
> Reason for revert: <INSERT REASONING HERE>
> 
> Original change's description:
> > Fixes from sample count change
> > 
> > Re blacklist imagination msaa on Vulkan and fix i->1 bug in GL
> > 
> > Bug: skia:
> > Change-Id: I8045565b2064d2ee037ab43b167e6d5d3a59268e
> > Reviewed-on: https://skia-review.googlesource.com/24780
> > Reviewed-by: Cary Clark <caryclark@google.com>
> > Commit-Queue: Greg Daniel <egdaniel@google.com>
> 
> TBR=egdaniel@google.com,bsalomon@google.com,caryclark@google.com
> 
> Change-Id: I8e3c95621eb0bc6ea2be24cc4ee67f88239263ed
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/24863
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>

TBR=egdaniel@google.com,bsalomon@google.com,caryclark@google.com

Change-Id: I43cb50691885cae8fe8bab1f034eb6a00b77de81
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/24900
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
2017-07-20 13:11:19 +00:00
Greg Daniel
914b285d45 Revert "Fixes from sample count change"
This reverts commit f3316224b9.

Reason for revert: <INSERT REASONING HERE>

Original change's description:
> Fixes from sample count change
> 
> Re blacklist imagination msaa on Vulkan and fix i->1 bug in GL
> 
> Bug: skia:
> Change-Id: I8045565b2064d2ee037ab43b167e6d5d3a59268e
> Reviewed-on: https://skia-review.googlesource.com/24780
> Reviewed-by: Cary Clark <caryclark@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>

TBR=egdaniel@google.com,bsalomon@google.com,caryclark@google.com

Change-Id: I8e3c95621eb0bc6ea2be24cc4ee67f88239263ed
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/24863
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
2017-07-20 13:02:39 +00:00
Cary Clark
ff98644cb4 Revert "Revert "Fixes from sample count change""
This reverts commit 390aaaf403.

Reason for revert: could not revert breaking change automatically because of conflict during merge

Original change's description:
> Revert "Fixes from sample count change"
> 
> This reverts commit f3316224b9.
> 
> Reason for revert: android vulkan build broken
> 
> Original change's description:
> > Fixes from sample count change
> > 
> > Re blacklist imagination msaa on Vulkan and fix i->1 bug in GL
> > 
> > Bug: skia:
> > Change-Id: I8045565b2064d2ee037ab43b167e6d5d3a59268e
> > Reviewed-on: https://skia-review.googlesource.com/24780
> > Reviewed-by: Cary Clark <caryclark@google.com>
> > Commit-Queue: Greg Daniel <egdaniel@google.com>
> 
> TBR=egdaniel@google.com,bsalomon@google.com,caryclark@google.com
> 
> Change-Id: I076a4226f5725b3d48592402772ca39b64cae478
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/24840
> Reviewed-by: Cary Clark <caryclark@google.com>
> Commit-Queue: Cary Clark <caryclark@google.com>

TBR=egdaniel@google.com,bsalomon@google.com,caryclark@google.com

Change-Id: I890540a68c18ed390773e97066ed92fea370d083
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/24842
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Cary Clark <caryclark@google.com>
2017-07-20 11:02:59 +00:00
Cary Clark
390aaaf403 Revert "Fixes from sample count change"
This reverts commit f3316224b9.

Reason for revert: android vulkan build broken

Original change's description:
> Fixes from sample count change
> 
> Re blacklist imagination msaa on Vulkan and fix i->1 bug in GL
> 
> Bug: skia:
> Change-Id: I8045565b2064d2ee037ab43b167e6d5d3a59268e
> Reviewed-on: https://skia-review.googlesource.com/24780
> Reviewed-by: Cary Clark <caryclark@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>

TBR=egdaniel@google.com,bsalomon@google.com,caryclark@google.com

Change-Id: I076a4226f5725b3d48592402772ca39b64cae478
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/24840
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Cary Clark <caryclark@google.com>
2017-07-20 10:57:30 +00:00
Mike Reed
e32500f064 Assume HQ is handled by pipeline, delete legacy code-path
CQ_INCLUDE_TRYBOTS=skia.primary:Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD
Bug: skia:
Change-Id: If6f0d0a57463bf99a66d674e65a62ce3931d0116
Reviewed-on: https://skia-review.googlesource.com/24644
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
2017-07-20 00:43:37 +00:00
Brian Osman
3e583cba8a Strip out unused tracing macros
Bug: skia:
Change-Id: I3edbc50820af6414405a7d4810178e050234db0c
Reviewed-on: https://skia-review.googlesource.com/24743
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
2017-07-20 00:26:07 +00:00
Brian Salomon
d17f6584df Remove GrBackendTextureDesc
Change-Id: I2b123d1782400e97ab2ce2f11e3e3d325a13e6c8
Reviewed-on: https://skia-review.googlesource.com/24748
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
2017-07-20 00:21:18 +00:00
Hal Canary
22b2d8c5e1 SkPDF: minor cleanups of skpdfdevice
Change-Id: I2143daaa6061003d8631f38ea39724fb12d494db
Reviewed-on: https://skia-review.googlesource.com/24747
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
2017-07-20 00:09:57 +00:00
Hal Canary
7e872caaf6 SkPDF: SkPDFMakeShader takes the paint color.
This allows alpha blending and also alpha shaders with color blended in.

fixes GMs:  composeshader_alpha, composeshader_bitmap

Change-Id: I3ab9cbef216f7733798d2e29541b4211c627dab2
Reviewed-on: https://skia-review.googlesource.com/24760
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
2017-07-19 22:25:22 +00:00
Mike Reed
b7648a2758 removed dead colortable code
Bug: skia:6828
Change-Id: I2d3b3b7c846d3ac08bbcb9357cb644873fe5a286
Reviewed-on: https://skia-review.googlesource.com/24623
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Leon Scroggins <scroggo@google.com>
2017-07-19 22:20:57 +00:00
Brian Salomon
1635146864 Make GrPipeline non-refcounted
GrPipelines are now created in GrOpFlushState's arena during GrOp::prepare() and cleaned up when the arena is destroyed.

Change-Id: I2cc4f03ce130bfb22e9d28bb3c22c485113d5d53
Reviewed-on: https://skia-review.googlesource.com/24681
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
2017-07-19 22:20:18 +00:00