aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrInOrderCommandBuilder.cpp
diff options
context:
space:
mode:
authorGravatar bsalomon <bsalomon@google.com>2015-08-10 13:03:50 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-08-10 13:03:51 -0700
commit5ac42ea8079c9368430971943192772984da5fce (patch)
treeba62ea9a747df79b380c6c8a235ac30c9eef29eb /src/gpu/GrInOrderCommandBuilder.cpp
parent4977983510028712528743aa877f6da83781b381 (diff)
Make initBatchTracker private, move towards pipeline on batch
Diffstat (limited to 'src/gpu/GrInOrderCommandBuilder.cpp')
-rw-r--r--src/gpu/GrInOrderCommandBuilder.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gpu/GrInOrderCommandBuilder.cpp b/src/gpu/GrInOrderCommandBuilder.cpp
index b679b6f3b8..912f0b5dbd 100644
--- a/src/gpu/GrInOrderCommandBuilder.cpp
+++ b/src/gpu/GrInOrderCommandBuilder.cpp
@@ -25,9 +25,11 @@ static bool path_fill_type_is_winding(const GrStencilSettings& pathStencilSettin
return isWinding;
}
-GrTargetCommands::Cmd* GrInOrderCommandBuilder::recordDrawBatch(State* state, GrBatch* batch) {
+GrTargetCommands::Cmd* GrInOrderCommandBuilder::recordDrawBatch(const State* state,
+ const GrPipelineOptimizations& opts,
+ GrBatch* batch) {
// Check if there is a Batch Draw we can batch with
- batch->setPipeline(state->getPipeline());
+ batch->setPipeline(state->getPipeline(), opts);
GrBATCH_INFO("In-Recording (%s, %u)\n", batch->name(), batch->uniqueID());
if (!this->cmdBuffer()->empty() &&
Cmd::kDrawBatch_CmdType == this->cmdBuffer()->back().type()) {