OLD | NEW |
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 Loading... |
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 |
414 fCommands.closeBatch(); | 415 fCommands.closeBatch(); |
| 416 #endif |
415 | 417 |
416 this->INHERITED::willReserveVertexAndIndexSpace(vertexCount, vertexStride, i
ndexCount); | 418 this->INHERITED::willReserveVertexAndIndexSpace(vertexCount, vertexStride, i
ndexCount); |
417 } | 419 } |
OLD | NEW |