|
Revert of Separate user and raw stencil settings (patchset #8 id:140001 of https://codereview.chromium.org/1962243002/ )
Reason for revert:
This seems to be breaking nanobench on the Windows bots with:
Caught exception 3221225477 EXCEPTION_ACCESS_VIOLATION
GrDrawTarget::stencilPath +c7
GrStencilAndCoverPathRenderer::onDrawPath +fd
GrDrawContext::internalDrawPath +509
GrDrawContext::drawPath +223
GrBlurUtils::drawPathWithMaskFilter +250
SkGpuDevice::drawPath +2ea
SkCanvas::onDrawPath +2e3
SkRecordDraw +2e6
SkBigPicture::playback +e5
SkCanvas::onDrawPicture +12c
SkCanvas::drawPicture +145
SkRecordDraw +2e6
SkBigPicture::playback +e5
SkCanvas::onDrawPicture +12c
SkCanvas::drawPicture +145
SkRecordDraw +261
SkBigPicture::playback +e5
SkCanvas::onDrawPicture +12c
SkCanvas::drawPicture +145
SkMultiPictureDraw::draw +bf
SKPBench::drawMPDPicture +1e0
SKPBench::onDraw +34
Benchmark::draw +32
time +92
setup_gpu_bench +6e
nanobench_main +77b
Original issue's description:
> Separate user and raw stencil settings
>
> Adds a new GrUserStencilSettings class that describes in abstract terms
> how a draw will use the stencil (e.g. kAlwaysIfInClip, kSetClipBit,
> etc.). GrPipelineBuilder now only defines the GrUserStencilSettings.
> When the GrPipeline is finalized, the user stencil settings are then
> translated into concrete GrStencilSettings.
>
> At this point, GrClipMaskManager only needs to tell the GrAppliedClip
> whether or not there is a stencil clip. It does not need to modify
> stencil settings and GrPipelineBuilder does not need
> AutoRestoreStencil.
>
> This is one step of the stencil overhaul. In the future it will also
> allow us to clean up the special case handling for nvpr and the
> stateful fClipMode member of GrClipMaskManager.
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1962243002
>
> Committed: https://skia.googlesource.com/skia/+/12dbb3947e1aaf205b4fcf13b40e54e50650eb37
TBR=bsalomon@google.com,cdalton@nvidia.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Committed: https://skia.googlesource.com/skia/+/e19aecdd13d83b2235faf3e2601100a2fd980b7b
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+1492 lines, -1379 lines) |
Patch |
|
M |
gyp/gpu.gypi
|
View
|
|
2 chunks |
+2 lines, -3 lines |
0 comments
|
Download
|
|
M |
src/gpu/GrClipMaskManager.h
|
View
|
|
5 chunks |
+28 lines, -7 lines |
0 comments
|
Download
|
|
M |
src/gpu/GrClipMaskManager.cpp
|
View
|
|
23 chunks |
+239 lines, -60 lines |
0 comments
|
Download
|
|
M |
src/gpu/GrDrawContext.cpp
|
View
|
|
8 chunks |
+8 lines, -8 lines |
0 comments
|
Download
|
|
M |
src/gpu/GrDrawContextPriv.h
|
View
|
|
3 chunks |
+3 lines, -3 lines |
0 comments
|
Download
|
|
M |
src/gpu/GrDrawTarget.h
|
View
|
|
2 chunks |
+5 lines, -1 line |
0 comments
|
Download
|
|
M |
src/gpu/GrDrawTarget.cpp
|
View
|
|
9 chunks |
+36 lines, -49 lines |
0 comments
|
Download
|
|
M |
src/gpu/GrGpu.h
|
View
|
|
3 chunks |
+12 lines, -1 line |
0 comments
|
Download
|
|
M |
src/gpu/GrPathRenderer.h
|
View
|
|
4 chunks |
+12 lines, -13 lines |
0 comments
|
Download
|
|
M |
src/gpu/GrPipeline.h
|
View
|
|
2 chunks |
+1 line, -3 lines |
0 comments
|
Download
|
|
M |
src/gpu/GrPipeline.cpp
|
View
|
|
5 chunks |
+23 lines, -30 lines |
0 comments
|
Download
|
|
M |
src/gpu/GrPipelineBuilder.h
|
View
|
|
3 chunks |
+51 lines, -14 lines |
0 comments
|
Download
|
|
M |
src/gpu/GrPipelineBuilder.cpp
|
View
|
|
2 chunks |
+7 lines, -5 lines |
0 comments
|
Download
|
|
A |
src/gpu/GrStencil.h
|
View
|
|
1 chunk |
+369 lines, -0 lines |
0 comments
|
Download
|
|
A |
src/gpu/GrStencil.cpp
|
View
|
|
1 chunk |
+403 lines, -0 lines |
0 comments
|
Download
|
|
D |
src/gpu/GrStencilSettings.h
|
View
|
|
1 chunk |
+0 lines, -121 lines |
0 comments
|
Download
|
|
D |
src/gpu/GrStencilSettings.cpp
|
View
|
|
1 chunk |
+0 lines, -489 lines |
0 comments
|
Download
|
|
D |
src/gpu/GrUserStencilSettings.h
|
View
|
|
1 chunk |
+0 lines, -237 lines |
0 comments
|
Download
|
|
M |
src/gpu/batches/GrDefaultPathRenderer.cpp
|
View
|
|
2 chunks |
+6 lines, -6 lines |
0 comments
|
Download
|
|
M |
src/gpu/batches/GrDrawPathBatch.h
|
View
|
|
1 chunk |
+1 line, -4 lines |
0 comments
|
Download
|
|
M |
src/gpu/batches/GrMSAAPathRenderer.cpp
|
View
|
|
2 chunks |
+6 lines, -6 lines |
0 comments
|
Download
|
|
M |
src/gpu/batches/GrPathStencilSettings.h
|
View
|
|
2 chunks |
+84 lines, -110 lines |
0 comments
|
Download
|
|
M |
src/gpu/batches/GrStencilAndCoverPathRenderer.cpp
|
View
|
|
4 chunks |
+22 lines, -27 lines |
0 comments
|
Download
|
|
M |
src/gpu/batches/GrStencilPathBatch.h
|
View
|
|
2 chunks |
+4 lines, -9 lines |
0 comments
|
Download
|
|
M |
src/gpu/gl/GrGLGpu.cpp
|
View
|
|
2 chunks |
+40 lines, -36 lines |
0 comments
|
Download
|
|
M |
src/gpu/gl/GrGLPathRendering.h
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
src/gpu/gl/GrGLPathRendering.cpp
|
View
|
|
5 chunks |
+20 lines, -17 lines |
0 comments
|
Download
|
|
M |
src/gpu/gl/GrGLUtil.h
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
src/gpu/gl/GrGLUtil.cpp
|
View
|
|
1 chunk |
+23 lines, -22 lines |
0 comments
|
Download
|
|
M |
src/gpu/text/GrStencilAndCoverTextContext.cpp
|
View
|
|
1 chunk |
+9 lines, -11 lines |
0 comments
|
Download
|
|
M |
src/gpu/vk/GrVkPipeline.cpp
|
View
|
|
2 chunks |
+59 lines, -63 lines |
0 comments
|
Download
|
|
M |
src/gpu/vk/GrVkPipelineState.h
|
View
|
|
1 chunk |
+0 lines, -1 line |
0 comments
|
Download
|
|
M |
tests/GLProgramsTest.cpp
|
View
|
|
1 chunk |
+16 lines, -20 lines |
0 comments
|
Download
|
Total messages: 4 (1 generated)
|