Commit Graph

14306 Commits

Author SHA1 Message Date
reed
9d93c2ebb3 Add SkCachedData and use it for SkMipMap
This reverts commit 37c5a815d8.

TBR=mtklein

Review URL: https://codereview.chromium.org/635333002
2014-10-08 05:17:12 -07:00
robertphillips
d61ef01f17 Expose layer hoisting API in GrContext
This CL exposes the layer hoisting API in GrContext for use in SkMultiPictureDraw::draw. It basically mirrors what SkGpuDevice::EXPERIMENTAL_drawPicture has been doing.

Review URL: https://codereview.chromium.org/533673002
2014-10-08 05:17:02 -07:00
bsalomon
10805961ce Revert of Make the Sk GL context class an abstract base class (patchset #4 id:60001 of https://codereview.chromium.org/630843002/)
Reason for revert:
nanobech failing on Android

Original issue's description:
> Make the Sk GL context class an abstract base class
>
> Make the Sk GL context class, SkGLNativeContext, an abstract base class. Before,
> it depended on ifdefs to implement the platform dependent polymorphism.  Move
> the logic to subclasses of the various platform implementations.
>
> This a step to enable Skia embedders to compile dm and bench_pictures. The
> concrete goal is to support running these test apps with Chromium command buffer.
>
> With this change, Chromium can implement its own version of SkGLNativeContext
> that uses command buffer, and host the implementation in its own repository.
>
> Implements the above by renaming the SkGLContextHelper to SkGLContext and
> removing the unneeded SkGLNativeContext. Also removes
> SkGLNativeContext::AutoRestoreContext functionality, it appeared to be unused:
> no use in Skia code, and no tests.
>
> BUG=skia:2992
>
> Committed: https://skia.googlesource.com/skia/+/a90ed4e83897b45d6331ee4c54e1edd4054de9a8

TBR=kkinnunen@nvidia.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2992

Review URL: https://codereview.chromium.org/639793002
2014-10-08 04:45:10 -07:00
bsalomon
a5ee45ce9d Revert of speculative fix for ios (patchset #1 id:1 of https://codereview.chromium.org/637293003/)
Reason for revert:
Need to revert a90ed4e838

Original issue's description:
> speculative fix for ios
>
> TBR=
>
> Committed: https://skia.googlesource.com/skia/+/96e89d5b45e8e293139ecd95302b5b4f07f8e9dc

TBR=
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/636153002
2014-10-08 04:43:50 -07:00
Brian Salomon
96e89d5b45 speculative fix for ios
TBR=

Review URL: https://codereview.chromium.org/637293003
2014-10-08 07:40:25 -04:00
bsalomon
8dd35ce178 Make GM default to reseting gpu contexts on android.
TBR=mtklein@google.com

Review URL: https://codereview.chromium.org/635293003
2014-10-08 04:20:56 -07:00
kkinnunen
a90ed4e838 Make the Sk GL context class an abstract base class
Make the Sk GL context class, SkGLNativeContext, an abstract base class. Before,
it depended on ifdefs to implement the platform dependent polymorphism.  Move
the logic to subclasses of the various platform implementations.

This a step to enable Skia embedders to compile dm and bench_pictures. The
concrete goal is to support running these test apps with Chromium command buffer.

With this change, Chromium can implement its own version of SkGLNativeContext
that uses command buffer, and host the implementation in its own repository.

Implements the above by renaming the SkGLContextHelper to SkGLContext and
removing the unneeded SkGLNativeContext. Also removes
SkGLNativeContext::AutoRestoreContext functionality, it appeared to be unused:
no use in Skia code, and no tests.

BUG=skia:2992

Review URL: https://codereview.chromium.org/630843002
2014-10-08 04:14:24 -07:00
borenet
5a161ea78e Update SKP version to 120
Automatic commit by the RecreateSKPs bot.

TBR=

Review URL: https://codereview.chromium.org/637173002
2014-10-07 21:20:23 -07:00
joshualitt
47bb382830 Cleanup of shader building system
this is a huge refactor and cleanup of the gl shader building system in
Skia.  The entire shader building pipeline is now part of
GrGLProgramCreator, which takes a gp, and some fps, and creates a
program.  I added some subclasses of GrGLProgram to handle the
eccentricities of Nvpr/Nvpres.  Outside of the builders folder
and GrGLPrograms, this change is basically just a rename

solo gp

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/fe1233c3f12f81bb675718516bbb32f72af726ec

Review URL: https://codereview.chromium.org/611653002
2014-10-07 16:43:25 -07:00
derekf
e6efd39a33 Only use msaa target for blur mask when doAA is true
BUG=skia:2995

Review URL: https://codereview.chromium.org/639523002
2014-10-07 14:44:34 -07:00
joshualitt
db0d3ca070 Revert of Cleanup of shader building system (patchset #25 id:470001 of https://codereview.chromium.org/611653002/)
Reason for revert:
Seems to have messed up windows 7 gms

Original issue's description:
> Cleanup of shader building system
>
> this is a huge refactor and cleanup of the gl shader building system in
> Skia.  The entire shader building pipeline is now part of
> GrGLProgramCreator, which takes a gp, and some fps, and creates a
> program.  I added some subclasses of GrGLProgram to handle the
> eccentricities of Nvpr/Nvpres.  Outside of the builders folder
> and GrGLPrograms, this change is basically just a rename
>
>
> solo gp
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/fe1233c3f12f81bb675718516bbb32f72af726ec

TBR=bsalomon@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/635533005
2014-10-07 12:42:26 -07:00
joshualitt
fe1233c3f1 Cleanup of shader building system
this is a huge refactor and cleanup of the gl shader building system in
Skia.  The entire shader building pipeline is now part of
GrGLProgramCreator, which takes a gp, and some fps, and creates a
program.  I added some subclasses of GrGLProgram to handle the
eccentricities of Nvpr/Nvpres.  Outside of the builders folder
and GrGLPrograms, this change is basically just a rename

solo gp

BUG=skia:

Review URL: https://codereview.chromium.org/611653002
2014-10-07 12:16:36 -07:00
Brian Salomon
9323b8b8e1 Revert "GrResourceCache2 manages scratch texture."
This reverts commit d14e1a2764.
2014-10-07 15:07:38 -04:00
mtklein
65be97d1a1 Stay in floats as much as possible in SkTileGrid, particularly in insert.
SkTileGrid::insert() is about 15% of recording time before
this CL, which reduces it to ~10%.  Next steps are looking
into some of the TODOs I've left myself, and vectorizing
the math.

Most of the win here comes from converting integer
divisions into float multiplies.

BUG=skia:1021

Review URL: https://codereview.chromium.org/615853007
2014-10-07 11:46:39 -07:00
jvanverth
d99741cbbe Update perspective GMs for dfpaths
TBR=egdaniel@google.com

Review URL: https://codereview.chromium.org/632363004
2014-10-07 10:55:43 -07:00
jvanverth
c7c2716a5b Add baselines for dftext GM.
TBR=robertphillips@google.com

Review URL: https://codereview.chromium.org/638683002
2014-10-07 10:23:34 -07:00
mtklein
38ba4e0588 Add -Wno-invalid-offsetof to Mac and iOS builds too.
We use this on Linux already, but for whatever reason wasn't a problem on iOS
until using it in SkPaint.  Mac 10.7 and 10.8 are showing this warning too,
but seems -Werror is not enabled.

CQ_EXTRA_TRYBOTS=tryserver.skia:Build-Mac10.7-Clang-Arm7-Release-iOS-Trybot

BUG=skia:

Review URL: https://codereview.chromium.org/637593002
2014-10-07 09:54:18 -07:00
mtklein
fb1fe4f518 Add SkPaint::getHash().
BUG=skia:

Review URL: https://codereview.chromium.org/637583002
2014-10-07 09:26:10 -07:00
joshualitt
d909759832 Revert of gl programs rewrite (patchset #10 id:180001 of https://codereview.chromium.org/628633003/)
Reason for revert:
breaks angle bot

Original issue's description:
> gl programs rewrite
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/07a255310aca9f3e83bf741dc663a58818ad681c

TBR=bsalomon@google.com,egdaniel@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/631183003
2014-10-07 08:37:36 -07:00
joshualitt
07a255310a gl programs rewrite
BUG=skia:

Review URL: https://codereview.chromium.org/628633003
2014-10-07 08:05:21 -07:00
jvanverth
f19657f1d4 Fix for perspective GMs and df paths.
Review URL: https://codereview.chromium.org/636933003
2014-10-07 08:04:58 -07:00
jvanverth
f9669f43bf Fix perspective version of dftext GM
Review URL: https://codereview.chromium.org/634923002
2014-10-07 07:59:46 -07:00
bsalomon
d14e1a2764 GrResourceCache2 manages scratch texture.
BUG=skia:2889

Review URL: https://codereview.chromium.org/608883003
2014-10-07 07:27:07 -07:00
egdaniel
b109ac22b4 Make createOptDrawState return NULL if we would end up not drawing
BUG=skia:

Review URL: https://codereview.chromium.org/630063002
2014-10-07 06:45:44 -07:00
reed
d3ce6b44e5 explicitly delete our c++ window on quit
BUG=skia:
TBR=
NOTRY=True

Review URL: https://codereview.chromium.org/633923002
2014-10-07 06:42:09 -07:00
bsalomon
ebfce4149e Revert of Don't readback and reupload texture-backed bitmaps (patchset #1 id:1 of https://codereview.chromium.org/635573004/)
Reason for revert:
This fails on some Android devices, missing part of tileimagefilter GM which were previously triggering the readback/upload code path.

Original issue's description:
> Don't readback and reupload texture-backed bitmaps
>
> Committed: https://skia.googlesource.com/skia/+/b9ab5631703c258f1aae7a3ca1bb4b6596b5b42c

TBR=robertphillips@google.com
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/632293002
2014-10-07 06:20:25 -07:00
robertphillips
c1188aacd5 Added more msaa blurring rebaselines & a suppression
These are rebaselines for: Create MSAA render target for blur mask texture - https://codereview.chromium.org/616923004

BUG=skia:2995
TBR=bsalomon@google.com
NOTRY=true

Review URL: https://codereview.chromium.org/628813003
2014-10-07 05:56:24 -07:00
bsalomon
f80bfedc42 GrContext::copyTexture->GrContext::copySurface.
Add a flush writes pixel ops flag.

Add an explicit flush writes for GrSurface.

BUG=skia:2977

Committed: https://skia.googlesource.com/skia/+/cf99b00980b6c9c557e71abf1a7c9f9b21217262

Review URL: https://codereview.chromium.org/622663002
2014-10-07 05:56:02 -07:00
bsalomon
b9ab563170 Don't readback and reupload texture-backed bitmaps
Review URL: https://codereview.chromium.org/635573004
2014-10-07 05:19:24 -07:00
robertphillips
b1b2085569 Rebaseline multipicturedraw_biglayer_*
TBR=reed@google.com
NOTRY=true

Review URL: https://codereview.chromium.org/635813003
2014-10-07 05:08:12 -07:00
robertphillips
40e01c499e Remove suppressions in ignored-tests.txt
This should be safe after: Update suppressed baseline images - https://codereview.chromium.org/605973003/

TBR=reed@google.com
NOTRY=true

Review URL: https://codereview.chromium.org/628013003
2014-10-07 04:52:16 -07:00
reed
59c01e0884 extra call to flush until brian can figure it out
BUG=skia:
TBR=bsalomon@google.com

Review URL: https://codereview.chromium.org/633643004
2014-10-07 04:04:46 -07:00
borenet
e8a6751e98 Update SKP version to 119
Automatic commit by the RecreateSKPs bot.

TBR=

Review URL: https://codereview.chromium.org/635723002
2014-10-07 04:04:36 -07:00
reed
3fc02f1720 override applicationShouldTerminate so we can cleanup when we quit
BUG=skia:
TBR=

Review URL: https://codereview.chromium.org/636723002
2014-10-07 03:59:34 -07:00
rmistry
5397725ca7 Whitespace change to test CQ
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/630093003
2014-10-07 03:59:27 -07:00
bsalomon
4e8955b772 Rebaseline after msaa blur change
TBR=robertphillips@google.com
NOTRY=true

Review URL: https://codereview.chromium.org/631993002
2014-10-06 13:29:22 -07:00
robertphillips
e71d8841ce Update suppressed baseline images
This updates the non-multipicturedraw GM images suppressed in:
Don't turn on dither for saveLayers which have no paint - https://codereview.chromium.org/619363002/

TBR=reed@google.com
NOTRY=true

Review URL: https://codereview.chromium.org/605973003
2014-10-06 12:54:15 -07:00
jvanverth
ed14f1d9db Reduce sizes in dftext GM on Android to match desktop better.
Review URL: https://codereview.chromium.org/630103003
2014-10-06 12:50:54 -07:00
Greg Humphreys
345379dd3c fix missing webtry output capture display
BUG=skia:

Review URL: https://codereview.chromium.org/628353002
2014-10-06 15:40:06 -04:00
Greg Humphreys
261f7a62d2 rework webtry css with compass and bootstrap
BUG=skia:

Review URL: https://codereview.chromium.org/623173004
2014-10-06 15:34:28 -04:00
reed
4302ae91b0 add surfaceprops to SkWindow, and 'D' to toggle distancefieldfonts
BUG=skia:

Review URL: https://codereview.chromium.org/631943002
2014-10-06 12:29:56 -07:00
robertphillips
3342d1b5a0 Add suppression for multipicturedraw_biglayer GM
TBR=reed@google.com
NOTRY=true

Review URL: https://codereview.chromium.org/631973002
2014-10-06 12:27:53 -07:00
robertphillips
410dd051c3 Fix some incorrect assumptions in GrLayerCache.cpp
Review URL: https://codereview.chromium.org/630173002
2014-10-06 12:19:50 -07:00
derekf
f4555aa53c Create MSAA render target for blur mask texture
Original Author: Henry Song <henrysong@samsung.com>

Review URL: https://codereview.chromium.org/616923004
2014-10-06 12:19:12 -07:00
egdaniel
307796bc2e Plumb OptDrawState down to VertexShaderBuilder
BUG=skia:

Review URL: https://codereview.chromium.org/628293002
2014-10-06 12:13:54 -07:00
robertphillips
1564dde11a Fix multipicturedraw_biglayer GM
Having a layer is a prerequisite for having it be hoisted.

Review URL: https://codereview.chromium.org/632743002
2014-10-06 11:50:31 -07:00
robertphillips
0cb34b5ab6 Update baseline GM images
This updates the multipicturedraw_* GM images for:

Reduce overdraw in MultiPictureDraw Sierpinski GM - https://codereview.chromium.org/582633003/
Don't turn on dither for saveLayers which have no paint - https://codereview.chromium.org/619363002/

TBR=reed@google.com
NOTRY=true

Review URL: https://codereview.chromium.org/632703003
2014-10-06 11:41:04 -07:00
mtklein
e356c7f0ee Restore a really single-threaded mode to DM.
Used to be:
   0 -> run on main thread plus an autodetected number of extra threads (default)
   N -> run on main thread plus N extra threads

Now it's:
  -1 -> run on main thread plus an autodetected number of extra threads (default)
   0 -> run on main thread
   N -> run on main thread plus N extra threads

BUG=skia:

Review URL: https://codereview.chromium.org/636593002
2014-10-06 11:24:08 -07:00
reed
8e47478333 implement some so we can test it
NOTRY=True
TBR=

Review URL: https://codereview.chromium.org/629903004
2014-10-06 11:00:51 -07:00
robertphillips
2e5a986bc7 New baselines
New baseline images for multipicturedraw_biglayer* GMs added in (Add a MultiPictureDraw GM to exercise layer clipping - https://codereview.chromium.org/617723004/).

NOTRY=true
TBR=reed@google.com

Review URL: https://codereview.chromium.org/629293002
2014-10-06 10:57:14 -07:00