Make GrClipMaskManager stateless and push GrPipelineBuilder construction downstack

Make GrClipMaskManager stateless and push GrPipelineBuilder construction downstack

This will be followed up with a CL to remove the GrRenderTarget from the GrPipelineBuilder.

Split out of:
https://codereview.chromium.org/1988923002/ (Declassify GrClipMaskManager and Remove GrRenderTarget and GrDrawTarget from GrPipelineBuilder)

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2035823002

Committed: https://skia.googlesource.com/skia/+/976f5f0dc5e907d1ca50685fad117bd15d7fc87b

[robertphillips, 2016-06-02 16:48:57]

Description was changed from

==========
Make GrClipMaskManager stateless and push GrPipelineBuilder construction
downstack
==========

to

==========
Make GrClipMaskManager stateless and push GrPipelineBuilder construction
downstack
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2035823002
==========

[robertphillips, 2016-06-02 16:49:58]

Description was changed from

==========
Make GrClipMaskManager stateless and push GrPipelineBuilder construction
downstack
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2035823002
==========

to

==========
Make GrClipMaskManager stateless and push GrPipelineBuilder construction
downstack

Split out of:
https://codereview.chromium.org/1988923002/ (Declassify GrClipMaskManager and
Remove GrRenderTarget and GrDrawTarget from GrPipelineBuilder)

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2035823002
==========

[robertphillips, 2016-06-02 16:49:58]

robertphillips@google.com changed reviewers:
+ bsalomon@google.com

[robertphillips, 2016-06-02 17:12:26]

Description was changed from

==========
Make GrClipMaskManager stateless and push GrPipelineBuilder construction
downstack

Split out of:
https://codereview.chromium.org/1988923002/ (Declassify GrClipMaskManager and
Remove GrRenderTarget and GrDrawTarget from GrPipelineBuilder)

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2035823002
==========

to

==========
Make GrClipMaskManager stateless and push GrPipelineBuilder construction
downstack

This will be followed up with a CL to remove the GrRenderTarget from the
GrPipelineBuilder.

Split out of:
https://codereview.chromium.org/1988923002/ (Declassify GrClipMaskManager and
Remove GrRenderTarget and GrDrawTarget from GrPipelineBuilder)

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2035823002
==========

[robertphillips, 2016-06-02 17:28:45]

The CQ bit was checked by robertphillips@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-06-02 17:28:56]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2035823002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/2035823002/20001

[commit-bot: I haz the power, 2016-06-02 17:31:25]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-02 17:31:26]

Dry run: Try jobs failed on following builders:
  Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared-Trybot on client.skia
(JOB_FAILED,
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2...)

[robertphillips, 2016-06-02 17:53:17]

The CQ bit was checked by robertphillips@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-06-02 17:53:24]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2035823002/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/2035823002/40001

[commit-bot: I haz the power, 2016-06-02 18:18:04]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-02 18:18:05]

Dry run: This issue passed the CQ dry run.

[bsalomon, 2016-06-03 14:27:16]

https://codereview.chromium.org/2035823002/diff/40001/include/gpu/GrDrawConte...
File include/gpu/GrDrawContext.h (right):

https://codereview.chromium.org/2035823002/diff/40001/include/gpu/GrDrawConte...
include/gpu/GrDrawContext.h:304: friend class GrSWMaskHelper;                 //
for access to drawBatch
Maybe just make drawBatch public? This seems to be arguing that most of the
users of this class want to be able to draw batches.

https://codereview.chromium.org/2035823002/diff/40001/src/gpu/GrClipMaskManag...
File src/gpu/GrClipMaskManager.cpp (right):

https://codereview.chromium.org/2035823002/diff/40001/src/gpu/GrClipMaskManag...
src/gpu/GrClipMaskManager.cpp:113: GrPathRenderer* pr =
context->drawingManager()->getPathRenderer(canDrawArgs, false, type);
It seems like this function's reliance on GrContext is having a large ripple. It
seems to need it for two things:

1) Getting caps. This seems like something DrawContext could (or probably
already does) provide.

2) Getting a path renderer. Can that be provided via DrawContext as well?

https://codereview.chromium.org/2035823002/diff/40001/src/gpu/GrDrawTarget.h
File src/gpu/GrDrawTarget.h (right):

https://codereview.chromium.org/2035823002/diff/40001/src/gpu/GrDrawTarget.h#...
src/gpu/GrDrawTarget.h:169: friend class GrDrawContextPriv; // for
clearStencilClip
isn't clearStencilClip a public function on GrDCP?

https://codereview.chromium.org/2035823002/diff/40001/src/gpu/GrPathRenderer.h
File src/gpu/GrPathRenderer.h (right):

https://codereview.chromium.org/2035823002/diff/40001/src/gpu/GrPathRenderer....
src/gpu/GrPathRenderer.h:167: args.fUserStencilSettings !=
&GrUserStencilSettings::kUnused;
Should we have a query on GrUSS?

[robertphillips, 2016-06-03 15:46:16]

https://codereview.chromium.org/2035823002/diff/40001/include/gpu/GrDrawConte...
File include/gpu/GrDrawContext.h (right):

https://codereview.chromium.org/2035823002/diff/40001/include/gpu/GrDrawConte...
include/gpu/GrDrawContext.h:304: friend class GrSWMaskHelper;                 //
for access to drawBatch
On 2016/06/03 14:27:15, bsalomon wrote:
> Maybe just make drawBatch public? This seems to be arguing that most of the
> users of this class want to be able to draw batches.

I intend to remove drawBatch and make all the sites that use it make a real draw
call. The overuse of drawBatch is a left over from all these sites only having
access to the GrDrawTarget.

https://codereview.chromium.org/2035823002/diff/40001/src/gpu/GrClipMaskManag...
File src/gpu/GrClipMaskManager.cpp (right):

https://codereview.chromium.org/2035823002/diff/40001/src/gpu/GrClipMaskManag...
src/gpu/GrClipMaskManager.cpp:113: GrPathRenderer* pr =
context->drawingManager()->getPathRenderer(canDrawArgs, false, type);
The getPathRenderer call should actually be limited to only appearing in
GrDrawContext. Right now the GrClipMaskManager is the only other user.

Similarly the GrDrawingManager should be more hidden.

So, I would like to clean up these usages but don't really want to open up the
drawContext (i.e., add getCaps() and getPathRenderer).

https://codereview.chromium.org/2035823002/diff/40001/src/gpu/GrDrawTarget.h
File src/gpu/GrDrawTarget.h (right):

https://codereview.chromium.org/2035823002/diff/40001/src/gpu/GrDrawTarget.h#...
src/gpu/GrDrawTarget.h:169: friend class GrDrawContextPriv; // for
clearStencilClip
On 2016/06/03 14:27:16, bsalomon wrote:
> isn't clearStencilClip a public function on GrDCP?

Right, GrDrawTarget::clearStencilClip is private however.

https://codereview.chromium.org/2035823002/diff/40001/src/gpu/GrPathRenderer.h
File src/gpu/GrPathRenderer.h (right):

https://codereview.chromium.org/2035823002/diff/40001/src/gpu/GrPathRenderer....
src/gpu/GrPathRenderer.h:167: args.fUserStencilSettings !=
&GrUserStencilSettings::kUnused;
On 2016/06/03 14:27:16, bsalomon wrote:
> Should we have a query on GrUSS?

Done.

[robertphillips, 2016-06-03 17:23:49]

The CQ bit was checked by robertphillips@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-06-03 17:23:54]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2035823002/60001

[commit-bot: I haz the power, 2016-06-03 17:43:23]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-03 17:43:24]

Dry run: This issue passed the CQ dry run.

[bsalomon, 2016-06-03 17:57:28]

lgtm

https://codereview.chromium.org/2035823002/diff/40001/include/gpu/GrDrawConte...
File include/gpu/GrDrawContext.h (right):

https://codereview.chromium.org/2035823002/diff/40001/include/gpu/GrDrawConte...
include/gpu/GrDrawContext.h:304: friend class GrSWMaskHelper;                 //
for access to drawBatch
On 2016/06/03 15:46:16, robertphillips wrote:
> On 2016/06/03 14:27:15, bsalomon wrote:
> > Maybe just make drawBatch public? This seems to be arguing that most of the
> > users of this class want to be able to draw batches.
> 
> I intend to remove drawBatch and make all the sites that use it make a real
draw
> call. The overuse of drawBatch is a left over from all these sites only having
> access to the GrDrawTarget.

I see, sgtm

https://codereview.chromium.org/2035823002/diff/40001/src/gpu/GrDrawTarget.h
File src/gpu/GrDrawTarget.h (right):

https://codereview.chromium.org/2035823002/diff/40001/src/gpu/GrDrawTarget.h#...
src/gpu/GrDrawTarget.h:169: friend class GrDrawContextPriv; // for
clearStencilClip
On 2016/06/03 15:46:16, robertphillips wrote:
> On 2016/06/03 14:27:16, bsalomon wrote:
> > isn't clearStencilClip a public function on GrDCP?
> 
> Right, GrDrawTarget::clearStencilClip is private however.

Oh, got it.

[robertphillips, 2016-06-03 17:57:53]

The CQ bit was checked by robertphillips@google.com

[commit-bot: I haz the power, 2016-06-03 17:58:02]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2035823002/60001

[commit-bot: I haz the power, 2016-06-03 17:59:23]

Description was changed from

==========
Make GrClipMaskManager stateless and push GrPipelineBuilder construction
downstack

This will be followed up with a CL to remove the GrRenderTarget from the
GrPipelineBuilder.

Split out of:
https://codereview.chromium.org/1988923002/ (Declassify GrClipMaskManager and
Remove GrRenderTarget and GrDrawTarget from GrPipelineBuilder)

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2035823002
==========

to

==========
Make GrClipMaskManager stateless and push GrPipelineBuilder construction
downstack

This will be followed up with a CL to remove the GrRenderTarget from the
GrPipelineBuilder.

Split out of:
https://codereview.chromium.org/1988923002/ (Declassify GrClipMaskManager and
Remove GrRenderTarget and GrDrawTarget from GrPipelineBuilder)

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2035823002

Committed:
https://skia.googlesource.com/skia/+/976f5f0dc5e907d1ca50685fad117bd15d7fc87b
==========

[commit-bot: I haz the power, 2016-06-03 17:59:24]

Committed patchset #4 (id:60001) as
https://skia.googlesource.com/skia/+/976f5f0dc5e907d1ca50685fad117bd15d7fc87b

[bungeman-skia, 2016-06-03 21:11:11]

bungeman@google.com changed reviewers:
+ bungeman@google.com

[bungeman-skia, 2016-06-03 21:11:12]

Leak should be fixed with https://codereview.chromium.org/2037193002/ .

https://codereview.chromium.org/2035823002/diff/60001/src/gpu/GrDrawContext.cpp
File src/gpu/GrDrawContext.cpp (right):

https://codereview.chromium.org/2035823002/diff/60001/src/gpu/GrDrawContext.c...
src/gpu/GrDrawContext.cpp:412:
paint.setXPFactory(GrDisableColorXPFactory::Create());
bug: leaks

[bungeman-skia, 2016-06-03 23:57:03]

Rest of the leaks of this sort should be fixed with
https://codereview.chromium.org/2037243002/ .

https://codereview.chromium.org/2035823002/diff/60001/src/gpu/GrClipMaskManag...
File src/gpu/GrClipMaskManager.cpp (right):

https://codereview.chromium.org/2035823002/diff/60001/src/gpu/GrClipMaskManag...
src/gpu/GrClipMaskManager.cpp:686:
paint.setXPFactory(GrDisableColorXPFactory::Create());
leak

https://codereview.chromium.org/2035823002/diff/60001/src/gpu/GrClipMaskManag...
src/gpu/GrClipMaskManager.cpp:727:
paint.setXPFactory(GrDisableColorXPFactory::Create());
leak

https://codereview.chromium.org/2035823002/diff/60001/src/gpu/batches/GrDefau...
File src/gpu/batches/GrDefaultPathRenderer.cpp (right):

https://codereview.chromium.org/2035823002/diff/60001/src/gpu/batches/GrDefau...
src/gpu/batches/GrDefaultPathRenderer.cpp:632:
paint.setXPFactory(GrDisableColorXPFactory::Create());
leak

https://codereview.chromium.org/2035823002/diff/60001/src/gpu/batches/GrMSAAP...
File src/gpu/batches/GrMSAAPathRenderer.cpp (right):

https://codereview.chromium.org/2035823002/diff/60001/src/gpu/batches/GrMSAAP...
src/gpu/batches/GrMSAAPathRenderer.cpp:754:
paint.setXPFactory(GrDisableColorXPFactory::Create());
leak

https://codereview.chromium.org/2035823002/diff/60001/src/gpu/batches/GrStenc...
File src/gpu/batches/GrStencilAndCoverPathRenderer.cpp (right):

https://codereview.chromium.org/2035823002/diff/60001/src/gpu/batches/GrStenc...
src/gpu/batches/GrStencilAndCoverPathRenderer.cpp:74:
paint.setXPFactory(GrDisableColorXPFactory::Create());
leak