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 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
352 | 352 |
353 if (gp) { | 353 if (gp) { |
354 int numTextures = gp->numTextures(); | 354 int numTextures = gp->numTextures(); |
355 for (int t = 0; t < numTextures; ++t) { | 355 for (int t = 0; t < numTextures; ++t) { |
356 GrTexture* texture = gp->texture(t); | 356 GrTexture* texture = gp->texture(t); |
357 SkASSERT(texture->asRenderTarget() != drawState.getRenderTarget()); | 357 SkASSERT(texture->asRenderTarget() != drawState.getRenderTarget()); |
358 } | 358 } |
359 } | 359 } |
360 | 360 |
361 for (int s = 0; s < drawState.numColorStages(); ++s) { | 361 for (int s = 0; s < drawState.numColorStages(); ++s) { |
362 const GrProcessor* effect = drawState.getColorStage(s).getProcessor(); | 362 const GrProcessor* effect = drawState.getColorStage(s).processor(); |
363 int numTextures = effect->numTextures(); | 363 int numTextures = effect->numTextures(); |
364 for (int t = 0; t < numTextures; ++t) { | 364 for (int t = 0; t < numTextures; ++t) { |
365 GrTexture* texture = effect->texture(t); | 365 GrTexture* texture = effect->texture(t); |
366 SkASSERT(texture->asRenderTarget() != drawState.getRenderTarget()); | 366 SkASSERT(texture->asRenderTarget() != drawState.getRenderTarget()); |
367 } | 367 } |
368 } | 368 } |
369 for (int s = 0; s < drawState.numCoverageStages(); ++s) { | 369 for (int s = 0; s < drawState.numCoverageStages(); ++s) { |
370 const GrProcessor* effect = drawState.getCoverageStage(s).getProcessor()
; | 370 const GrProcessor* effect = drawState.getCoverageStage(s).processor(); |
371 int numTextures = effect->numTextures(); | 371 int numTextures = effect->numTextures(); |
372 for (int t = 0; t < numTextures; ++t) { | 372 for (int t = 0; t < numTextures; ++t) { |
373 GrTexture* texture = effect->texture(t); | 373 GrTexture* texture = effect->texture(t); |
374 SkASSERT(texture->asRenderTarget() != drawState.getRenderTarget()); | 374 SkASSERT(texture->asRenderTarget() != drawState.getRenderTarget()); |
375 } | 375 } |
376 } | 376 } |
377 | 377 |
378 #endif | 378 #endif |
379 if (NULL == drawState.getRenderTarget()) { | 379 if (NULL == drawState.getRenderTarget()) { |
380 return false; | 380 return false; |
(...skipping 836 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1217 GrDrawState::AutoRestoreStencil* ars, | 1217 GrDrawState::AutoRestoreStencil* ars, |
1218 GrDrawState* ds, | 1218 GrDrawState* ds, |
1219 GrScissorState* scissorState) { | 1219 GrScissorState* scissorState) { |
1220 return fClipMaskManager.setupClipping(ds, | 1220 return fClipMaskManager.setupClipping(ds, |
1221 are, | 1221 are, |
1222 ars, | 1222 ars, |
1223 scissorState, | 1223 scissorState, |
1224 this->getClip(), | 1224 this->getClip(), |
1225 devBounds); | 1225 devBounds); |
1226 } | 1226 } |
OLD | NEW |