| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2010 Google Inc. | 3 * Copyright 2010 Google Inc. |
| 4 * | 4 * |
| 5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
| 6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 | 9 |
| 10 | 10 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 if (di.fDevBounds) { | 36 if (di.fDevBounds) { |
| 37 SkASSERT(di.fDevBounds == &di.fDevBoundsStorage); | 37 SkASSERT(di.fDevBounds == &di.fDevBoundsStorage); |
| 38 fDevBoundsStorage = di.fDevBoundsStorage; | 38 fDevBoundsStorage = di.fDevBoundsStorage; |
| 39 fDevBounds = &fDevBoundsStorage; | 39 fDevBounds = &fDevBoundsStorage; |
| 40 } else { | 40 } else { |
| 41 fDevBounds = NULL; | 41 fDevBounds = NULL; |
| 42 } | 42 } |
| 43 | 43 |
| 44 fDstCopy = di.fDstCopy; | 44 fDstCopy = di.fDstCopy; |
| 45 | 45 |
| 46 fVertexBuffer = di.fVertexBuffer; |
| 47 fIndexBuffer = di.fIndexBuffer; |
| 48 |
| 46 return *this; | 49 return *this; |
| 47 } | 50 } |
| 48 | 51 |
| 49 #ifdef SK_DEBUG | 52 #ifdef SK_DEBUG |
| 50 bool GrDrawTarget::DrawInfo::isInstanced() const { | 53 bool GrDrawTarget::DrawInfo::isInstanced() const { |
| 51 if (fInstanceCount > 0) { | 54 if (fInstanceCount > 0) { |
| 52 SkASSERT(0 == fIndexCount % fIndicesPerInstance); | 55 SkASSERT(0 == fIndexCount % fIndicesPerInstance); |
| 53 SkASSERT(0 == fVertexCount % fVerticesPerInstance); | 56 SkASSERT(0 == fVertexCount % fVerticesPerInstance); |
| 54 SkASSERT(fIndexCount / fIndicesPerInstance == fInstanceCount); | 57 SkASSERT(fIndexCount / fIndicesPerInstance == fInstanceCount); |
| 55 SkASSERT(fVertexCount / fVerticesPerInstance == fInstanceCount); | 58 SkASSERT(fVertexCount / fVerticesPerInstance == fInstanceCount); |
| (...skipping 1083 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1139 GrDrawState::AutoRestoreStencil* ars, | 1142 GrDrawState::AutoRestoreStencil* ars, |
| 1140 GrDrawState* ds, | 1143 GrDrawState* ds, |
| 1141 GrClipMaskManager::ScissorState* scissorState) { | 1144 GrClipMaskManager::ScissorState* scissorState) { |
| 1142 return fClipMaskManager.setupClipping(ds, | 1145 return fClipMaskManager.setupClipping(ds, |
| 1143 are, | 1146 are, |
| 1144 ars, | 1147 ars, |
| 1145 scissorState, | 1148 scissorState, |
| 1146 this->getClip(), | 1149 this->getClip(), |
| 1147 devBounds); | 1150 devBounds); |
| 1148 } | 1151 } |
| OLD | NEW |