OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2012 Google Inc. | 2 * Copyright 2012 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 "GrDrawState.h" | 8 #include "GrDrawState.h" |
9 #include "GrPaint.h" | 9 #include "GrPaint.h" |
10 | 10 |
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
396 return kNone_BlendOpt; | 396 return kNone_BlendOpt; |
397 } | 397 } |
398 | 398 |
399 //////////////////////////////////////////////////////////////////////////////// | 399 //////////////////////////////////////////////////////////////////////////////// |
400 | 400 |
401 void GrDrawState::AutoViewMatrixRestore::restore() { | 401 void GrDrawState::AutoViewMatrixRestore::restore() { |
402 if (NULL != fDrawState) { | 402 if (NULL != fDrawState) { |
403 SkDEBUGCODE(--fDrawState->fBlockEffectRemovalCnt;) | 403 SkDEBUGCODE(--fDrawState->fBlockEffectRemovalCnt;) |
404 fDrawState->fCommon.fViewMatrix = fViewMatrix; | 404 fDrawState->fCommon.fViewMatrix = fViewMatrix; |
405 SkASSERT(fDrawState->numColorStages() >= fNumColorStages); | 405 SkASSERT(fDrawState->numColorStages() >= fNumColorStages); |
406 int numCoverageStages = fSavedCoordChanges.count() - fNumColorStages; | 406 int numCoverageStages = int(fSavedCoordChanges.count()) - fNumColorStage
s; |
407 SkASSERT(fDrawState->numCoverageStages() >= numCoverageStages); | 407 SkASSERT(fDrawState->numCoverageStages() >= numCoverageStages); |
408 | 408 |
409 int i = 0; | 409 int i = 0; |
410 for (int s = 0; s < fNumColorStages; ++s, ++i) { | 410 for (int s = 0; s < fNumColorStages; ++s, ++i) { |
411 fDrawState->fColorStages[s].restoreCoordChange(fSavedCoordChanges[i]
); | 411 fDrawState->fColorStages[s].restoreCoordChange(fSavedCoordChanges[i]
); |
412 } | 412 } |
413 for (int s = 0; s < numCoverageStages; ++s, ++i) { | 413 for (int s = 0; s < numCoverageStages; ++s, ++i) { |
414 fDrawState->fCoverageStages[s].restoreCoordChange(fSavedCoordChanges
[i]); | 414 fDrawState->fCoverageStages[s].restoreCoordChange(fSavedCoordChanges
[i]); |
415 } | 415 } |
416 fDrawState = NULL; | 416 fDrawState = NULL; |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
475 fDrawState->fColorStages[s].saveCoordChange(&fSavedCoordChanges[i]); | 475 fDrawState->fColorStages[s].saveCoordChange(&fSavedCoordChanges[i]); |
476 fDrawState->fColorStages[s].localCoordChange(coordChangeMatrix); | 476 fDrawState->fColorStages[s].localCoordChange(coordChangeMatrix); |
477 } | 477 } |
478 | 478 |
479 int numCoverageStages = fDrawState->numCoverageStages(); | 479 int numCoverageStages = fDrawState->numCoverageStages(); |
480 for (int s = 0; s < numCoverageStages; ++s, ++i) { | 480 for (int s = 0; s < numCoverageStages; ++s, ++i) { |
481 fDrawState->fCoverageStages[s].saveCoordChange(&fSavedCoordChanges[i]); | 481 fDrawState->fCoverageStages[s].saveCoordChange(&fSavedCoordChanges[i]); |
482 fDrawState->fCoverageStages[s].localCoordChange(coordChangeMatrix); | 482 fDrawState->fCoverageStages[s].localCoordChange(coordChangeMatrix); |
483 } | 483 } |
484 } | 484 } |
OLD | NEW |