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 376 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
387 return; | 387 return; |
388 } | 388 } |
389 | 389 |
390 | 390 |
391 CmdBuffer::Iter iter(fCmdBuffer); | 391 CmdBuffer::Iter iter(fCmdBuffer); |
392 | 392 |
393 int currCmdMarker = 0; | 393 int currCmdMarker = 0; |
394 | 394 |
395 // Updated every time we find a set state cmd to reflect the current state i
n the playback | 395 // Updated every time we find a set state cmd to reflect the current state i
n the playback |
396 // stream. | 396 // stream. |
397 const GrOptDrawState* currentOptState = NULL; | 397 GrOptDrawState* currentOptState = NULL; |
398 | 398 |
399 while (iter.next()) { | 399 while (iter.next()) { |
400 GrGpuTraceMarker newMarker("", -1); | 400 GrGpuTraceMarker newMarker("", -1); |
401 SkString traceString; | 401 SkString traceString; |
402 if (cmd_has_trace_marker(iter->fType)) { | 402 if (cmd_has_trace_marker(iter->fType)) { |
403 traceString = fGpuCmdMarkers[currCmdMarker].toString(); | 403 traceString = fGpuCmdMarkers[currCmdMarker].toString(); |
404 newMarker.fMarker = traceString.c_str(); | 404 newMarker.fMarker = traceString.c_str(); |
405 this->getGpu()->addGpuTraceMarker(&newMarker); | 405 this->getGpu()->addGpuTraceMarker(&newMarker); |
406 ++currCmdMarker; | 406 ++currCmdMarker; |
407 } | 407 } |
408 | 408 |
409 if (kSetState_Cmd == strip_trace_bit(iter->fType)) { | 409 if (kSetState_Cmd == strip_trace_bit(iter->fType)) { |
410 SetState* ss = reinterpret_cast<SetState*>(iter.get()); | 410 SetState* ss = reinterpret_cast<SetState*>(iter.get()); |
411 currentOptState = &ss->fState; | 411 currentOptState = &ss->fState; |
| 412 currentOptState->finalize(this->getGpu()); |
412 } else { | 413 } else { |
413 iter->execute(this, currentOptState); | 414 iter->execute(this, currentOptState); |
414 } | 415 } |
415 | 416 |
416 if (cmd_has_trace_marker(iter->fType)) { | 417 if (cmd_has_trace_marker(iter->fType)) { |
417 this->getGpu()->removeGpuTraceMarker(&newMarker); | 418 this->getGpu()->removeGpuTraceMarker(&newMarker); |
418 } | 419 } |
419 } | 420 } |
420 | 421 |
421 SkASSERT(fGpuCmdMarkers.count() == currCmdMarker); | 422 SkASSERT(fGpuCmdMarkers.count() == currCmdMarker); |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
479 return true; | 480 return true; |
480 } | 481 } |
481 return false; | 482 return false; |
482 } | 483 } |
483 | 484 |
484 bool GrInOrderDrawBuffer::recordStateAndShouldDraw(const GrDrawState& ds, | 485 bool GrInOrderDrawBuffer::recordStateAndShouldDraw(const GrDrawState& ds, |
485 GrGpu::DrawType drawType, | 486 GrGpu::DrawType drawType, |
486 const GrClipMaskManager::Scis
sorState& scissor, | 487 const GrClipMaskManager::Scis
sorState& scissor, |
487 const GrDeviceCoordTexture* d
stCopy) { | 488 const GrDeviceCoordTexture* d
stCopy) { |
488 SetState* ss = GrNEW_APPEND_TO_RECORDER(fCmdBuffer, SetState, | 489 SetState* ss = GrNEW_APPEND_TO_RECORDER(fCmdBuffer, SetState, |
489 (ds, this->getGpu(), scissor, dstCop
y, drawType)); | 490 (ds, *this->getGpu()->caps(), scisso
r, dstCopy, |
| 491 drawType)); |
490 if (ss->fState.mustSkip()) { | 492 if (ss->fState.mustSkip()) { |
491 fCmdBuffer.pop_back(); | 493 fCmdBuffer.pop_back(); |
492 return false; | 494 return false; |
493 } | 495 } |
494 if (fPrevState && *fPrevState == ss->fState) { | 496 if (fPrevState && *fPrevState == ss->fState) { |
495 fCmdBuffer.pop_back(); | 497 fCmdBuffer.pop_back(); |
496 } else { | 498 } else { |
497 fPrevState = &ss->fState; | 499 fPrevState = &ss->fState; |
498 this->recordTraceMarkersIfNecessary(); | 500 this->recordTraceMarkersIfNecessary(); |
499 } | 501 } |
500 return true; | 502 return true; |
501 } | 503 } |
502 | 504 |
503 void GrInOrderDrawBuffer::recordTraceMarkersIfNecessary() { | 505 void GrInOrderDrawBuffer::recordTraceMarkersIfNecessary() { |
504 SkASSERT(!fCmdBuffer.empty()); | 506 SkASSERT(!fCmdBuffer.empty()); |
505 SkASSERT(!cmd_has_trace_marker(fCmdBuffer.back().fType)); | 507 SkASSERT(!cmd_has_trace_marker(fCmdBuffer.back().fType)); |
506 const GrTraceMarkerSet& activeTraceMarkers = this->getActiveTraceMarkers(); | 508 const GrTraceMarkerSet& activeTraceMarkers = this->getActiveTraceMarkers(); |
507 if (activeTraceMarkers.count() > 0) { | 509 if (activeTraceMarkers.count() > 0) { |
508 fCmdBuffer.back().fType = add_trace_bit(fCmdBuffer.back().fType); | 510 fCmdBuffer.back().fType = add_trace_bit(fCmdBuffer.back().fType); |
509 fGpuCmdMarkers.push_back(activeTraceMarkers); | 511 fGpuCmdMarkers.push_back(activeTraceMarkers); |
510 } | 512 } |
511 } | 513 } |
OLD | NEW |