| Index: src/gpu/GrReorderCommandBuilder.cpp
|
| diff --git a/src/gpu/GrReorderCommandBuilder.cpp b/src/gpu/GrReorderCommandBuilder.cpp
|
| index e373381cb28becd93630f59323c8486e05bf1f61..8c318fd0d00b322b0d247b0a596b98802f0e33f6 100644
|
| --- a/src/gpu/GrReorderCommandBuilder.cpp
|
| +++ b/src/gpu/GrReorderCommandBuilder.cpp
|
| @@ -23,6 +23,7 @@ GrTargetCommands::Cmd* GrReorderCommandBuilder::recordDrawBatch(State* state, Gr
|
| // Experimentally we have found that most batching occurs within the first 10 comparisons.
|
| static const int kMaxLookback = 10;
|
| int i = 0;
|
| + batch->setPipeline(state->getPipeline());
|
| if (!this->cmdBuffer()->empty()) {
|
| GrTargetCommands::CmdBuffer::ReverseIter reverseIter(*this->cmdBuffer());
|
|
|
| @@ -30,8 +31,7 @@ GrTargetCommands::Cmd* GrReorderCommandBuilder::recordDrawBatch(State* state, Gr
|
| if (Cmd::kDrawBatch_CmdType == reverseIter->type()) {
|
| DrawBatch* previous = static_cast<DrawBatch*>(reverseIter.get());
|
|
|
| - if (previous->fState->getPipeline()->isEqual(*state->getPipeline()) &&
|
| - previous->fBatch->combineIfPossible(batch)) {
|
| + if (previous->fBatch->combineIfPossible(batch)) {
|
| return NULL;
|
| }
|
|
|
|
|