| Index: src/gpu/GrReorderCommandBuilder.cpp
|
| diff --git a/src/gpu/GrReorderCommandBuilder.cpp b/src/gpu/GrReorderCommandBuilder.cpp
|
| index 151b516deed64aa2f8eaf58f232a0f1f031ed762..90953b047b00b2bf33757e97f70d9b6824ffcb23 100644
|
| --- a/src/gpu/GrReorderCommandBuilder.cpp
|
| +++ b/src/gpu/GrReorderCommandBuilder.cpp
|
| @@ -32,11 +32,10 @@ GrTargetCommands::Cmd* GrReorderCommandBuilder::recordDrawBatch(State* state, Gr
|
| if (Cmd::kDrawBatch_CmdType == reverseIter->type()) {
|
| DrawBatch* previous = static_cast<DrawBatch*>(reverseIter.get());
|
|
|
| - // We cannot continue to search backwards if the render target changes
|
| if (previous->fBatch->pipeline()->getRenderTarget() != rt) {
|
| break;
|
| }
|
| -
|
| + // We cannot continue to search backwards if the render target changes
|
| if (previous->fBatch->combineIfPossible(batch)) {
|
| return NULL;
|
| }
|
| @@ -53,9 +52,7 @@ GrTargetCommands::Cmd* GrReorderCommandBuilder::recordDrawBatch(State* state, Gr
|
| }
|
|
|
| // We set the color to illegal if we are doing a discard.
|
| - // If we can ignore the rect, then we do a full clear
|
| if (previous->fColor == GrColor_ILLEGAL ||
|
| - previous->fCanIgnoreRect ||
|
| intersect(batch->bounds(), previous->fRect)) {
|
| break;
|
| }
|
|
|