Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(627)

Side by Side Diff: src/gpu/GrInOrderDrawBuffer.cpp

Issue 1105203002: Revert of Stop closing batch prematurely (Closed) Base URL: https://skia.googlesource.com/skia.git@atdfopt3
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | src/gpu/GrTargetCommands.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2011 Google Inc. 2 * Copyright 2011 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "GrInOrderDrawBuffer.h" 8 #include "GrInOrderDrawBuffer.h"
9 9
10 #include "GrDefaultGeoProcFactory.h" 10 #include "GrDefaultGeoProcFactory.h"
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 } else { 404 } else {
405 cmd->setMarkerID(fGpuCmdMarkers.count()); 405 cmd->setMarkerID(fGpuCmdMarkers.count());
406 fGpuCmdMarkers.push_back(activeTraceMarkers); 406 fGpuCmdMarkers.push_back(activeTraceMarkers);
407 } 407 }
408 } 408 }
409 } 409 }
410 410
411 void GrInOrderDrawBuffer::willReserveVertexAndIndexSpace(int vertexCount, 411 void GrInOrderDrawBuffer::willReserveVertexAndIndexSpace(int vertexCount,
412 size_t vertexStride, 412 size_t vertexStride,
413 int indexCount) { 413 int indexCount) {
414 #ifndef USE_BITMAP_TEXTBLOBS
415 fCommands.closeBatch(); 414 fCommands.closeBatch();
416 #endif
417 415
418 this->INHERITED::willReserveVertexAndIndexSpace(vertexCount, vertexStride, i ndexCount); 416 this->INHERITED::willReserveVertexAndIndexSpace(vertexCount, vertexStride, i ndexCount);
419 } 417 }
OLDNEW
« no previous file with comments | « no previous file | src/gpu/GrTargetCommands.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698