Increase GrInOrderDrawBuffer's encapsulation of trace markers

Increase GrInOrderDrawBuffer's encapsulation of trace markers

Greg - I think this is mainly you
Joshua - I did make a small batching change in onDrawBatch

Committed: https://skia.googlesource.com/skia/+/7f966f4cf8baee769d7b52dce1dd48e8512302e4

[robertphillips, 2015-02-27 19:23:08]

robertphillips@google.com changed reviewers:
+ egdaniel@google.com, joshualitt@chromium.org

[joshualitt, 2015-02-27 19:26:42]

On 2015/02/27 19:23:20, robertphillips wrote:

maybe mark closeBatch as inline?  Its probably pretty minor but we do call it in
a ton of places.  your call.

[joshualitt, 2015-02-27 19:43:24]

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

[joshualitt, 2015-02-27 19:43:24]

https://codereview.chromium.org/963183002/diff/40001/src/gpu/GrInOrderDrawBuf...
File src/gpu/GrInOrderDrawBuffer.cpp (right):

https://codereview.chromium.org/963183002/diff/40001/src/gpu/GrInOrderDrawBuf...
src/gpu/GrInOrderDrawBuffer.cpp:403: this->closeBatch();
I should have been paying more attention.  This close batch isn't necessary,
because every nonbatch push into the draw buffer will always close the last open
batch.  Was there some kind of an issue here?

'closebatch' goes away once I finish text too(thank God).

[egdaniel, 2015-02-27 20:09:36]

https://codereview.chromium.org/963183002/diff/40001/src/gpu/GrInOrderDrawBuf...
File src/gpu/GrInOrderDrawBuffer.cpp (right):

https://codereview.chromium.org/963183002/diff/40001/src/gpu/GrInOrderDrawBuf...
src/gpu/GrInOrderDrawBuffer.cpp:409: DrawBatch* draw =
static_cast<DrawBatch*>(&fCmdBuffer.back());
I'm pretty sure this draw is fDrawBatch so we can just use that here. Also we
will want to call the recordTMIN for both cases here (when we merge batches we
should fall into the adding to set case on recordTMIN). So just drop this to

if(!combine) {...}
recordTMIN(fDrawBatch)

[robertphillips, 2015-02-27 20:52:39]

https://codereview.chromium.org/963183002/diff/40001/src/gpu/GrInOrderDrawBuf...
File src/gpu/GrInOrderDrawBuffer.cpp (right):

https://codereview.chromium.org/963183002/diff/40001/src/gpu/GrInOrderDrawBuf...
src/gpu/GrInOrderDrawBuffer.cpp:403: this->closeBatch();
On 2015/02/27 19:43:24, joshualitt wrote:
> I should have been paying more attention.  This close batch isn't necessary,
> because every nonbatch push into the draw buffer will always close the last
open
> batch.  Was there some kind of an issue here?
> 
> 'closebatch' goes away once I finish text too(thank God).

Done.

https://codereview.chromium.org/963183002/diff/40001/src/gpu/GrInOrderDrawBuf...
src/gpu/GrInOrderDrawBuffer.cpp:409: DrawBatch* draw =
static_cast<DrawBatch*>(&fCmdBuffer.back());
On 2015/02/27 20:09:36, egdaniel wrote:
> I'm pretty sure this draw is fDrawBatch so we can just use that here. Also we
> will want to call the recordTMIN for both cases here (when we merge batches we
> should fall into the adding to set case on recordTMIN). So just drop this to
> 
> if(!combine) {...}
> recordTMIN(fDrawBatch)

Done.

[robertphillips, 2015-02-27 21:06:17]

https://codereview.chromium.org/963183002/diff/40001/src/gpu/GrInOrderDrawBuf...
File src/gpu/GrInOrderDrawBuffer.cpp (right):

https://codereview.chromium.org/963183002/diff/40001/src/gpu/GrInOrderDrawBuf...
src/gpu/GrInOrderDrawBuffer.cpp:409: DrawBatch* draw =
static_cast<DrawBatch*>(&fCmdBuffer.back());
On 2015/02/27 20:09:36, egdaniel wrote:
> I'm pretty sure this draw is fDrawBatch so we can just use that here. Also we
> will want to call the recordTMIN for both cases here (when we merge batches we
> should fall into the adding to set case on recordTMIN). So just drop this to
> 
> if(!combine) {...}
> recordTMIN(fDrawBatch)

Done.

[egdaniel, 2015-03-02 14:26:02]

lgtm

[robertphillips, 2015-03-02 14:29:08]

The CQ bit was checked by robertphillips@google.com

[commit-bot: I haz the power, 2015-03-02 14:30:01]

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

[commit-bot: I haz the power, 2015-03-02 14:40:16]

Committed patchset #5 (id:2) as
https://skia.googlesource.com/skia/+/7f966f4cf8baee769d7b52dce1dd48e8512302e4