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 484 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
495 GrGpu::DrawType drawType, | 495 GrGpu::DrawType drawType, |
496 const GrClipMaskManager::Scis
sorState& scissor, | 496 const GrClipMaskManager::Scis
sorState& scissor, |
497 const GrDeviceCoordTexture* d
stCopy) { | 497 const GrDeviceCoordTexture* d
stCopy) { |
498 SetState* ss = GrNEW_APPEND_TO_RECORDER(fCmdBuffer, SetState, | 498 SetState* ss = GrNEW_APPEND_TO_RECORDER(fCmdBuffer, SetState, |
499 (ds, gp, pathProc, *this->getGpu()->
caps(), scissor, | 499 (ds, gp, pathProc, *this->getGpu()->
caps(), scissor, |
500 dstCopy, drawType)); | 500 dstCopy, drawType)); |
501 if (ss->fState.mustSkip()) { | 501 if (ss->fState.mustSkip()) { |
502 fCmdBuffer.pop_back(); | 502 fCmdBuffer.pop_back(); |
503 return false; | 503 return false; |
504 } | 504 } |
505 if (fPrevState && *fPrevState == ss->fState) { | 505 if (fPrevState && fPrevState->combineIfPossible(ss->fState)) { |
506 fCmdBuffer.pop_back(); | 506 fCmdBuffer.pop_back(); |
507 } else { | 507 } else { |
508 fPrevState = &ss->fState; | 508 fPrevState = &ss->fState; |
509 this->recordTraceMarkersIfNecessary(); | 509 this->recordTraceMarkersIfNecessary(); |
510 } | 510 } |
511 return true; | 511 return true; |
512 } | 512 } |
513 | 513 |
514 void GrInOrderDrawBuffer::recordTraceMarkersIfNecessary() { | 514 void GrInOrderDrawBuffer::recordTraceMarkersIfNecessary() { |
515 SkASSERT(!fCmdBuffer.empty()); | 515 SkASSERT(!fCmdBuffer.empty()); |
516 SkASSERT(!cmd_has_trace_marker(fCmdBuffer.back().fType)); | 516 SkASSERT(!cmd_has_trace_marker(fCmdBuffer.back().fType)); |
517 const GrTraceMarkerSet& activeTraceMarkers = this->getActiveTraceMarkers(); | 517 const GrTraceMarkerSet& activeTraceMarkers = this->getActiveTraceMarkers(); |
518 if (activeTraceMarkers.count() > 0) { | 518 if (activeTraceMarkers.count() > 0) { |
519 fCmdBuffer.back().fType = add_trace_bit(fCmdBuffer.back().fType); | 519 fCmdBuffer.back().fType = add_trace_bit(fCmdBuffer.back().fType); |
520 fGpuCmdMarkers.push_back(activeTraceMarkers); | 520 fGpuCmdMarkers.push_back(activeTraceMarkers); |
521 } | 521 } |
522 } | 522 } |
OLD | NEW |