commit cc1ac862752031fa3efd7429800a0f791c24e5cf
author joshualitt <joshualitt@chromium.org> Mon Mar 02 11:23:07 2015 -0800
committer Commit bot <commit-bot@chromium.org> Mon Mar 02 11:23:07 2015 -0800
tree 5ca8491399a3f1a45c2a6f8e7c2a3019b733c583
parent 8f9e81684fbc9c2c9660137cdfbe30902b4380f1

small bug fix for batch asserts

BUG=skia:

Review URL: https://codereview.chromium.org/969043002

src/gpu/GrInOrderDrawBuffer.cpp

diff --git a/src/gpu/GrInOrderDrawBuffer.cpp b/src/gpu/GrInOrderDrawBuffer.cpp
index 1ff018d..d89dd43 100644
--- a/src/gpu/GrInOrderDrawBuffer.cpp
+++ b/src/gpu/GrInOrderDrawBuffer.cpp
@@ -395,7 +395,7 @@
     }
 
     // Check if there is a Batch Draw we can batch with
-    if (Cmd::kDrawBatch_Cmd != fCmdBuffer.back().type()) {
+    if (Cmd::kDrawBatch_Cmd != fCmdBuffer.back().type() || !fDrawBatch) {
         fDrawBatch = GrNEW_APPEND_TO_RECORDER(fCmdBuffer, DrawBatch, (batch, &fBatchTarget));
         this->recordTraceMarkersIfNecessary(fDrawBatch);
         return;