diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-27 14:27:27 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-27 14:27:27 +0000 |
| commit | 67bddc497e30034c78e08de1f35502293a885596 (patch) | |
| tree | 6ac4e6f1824b28daf268d776c479a89de30401ed /src/gpu/gl | |
| parent | f47c217cc8de3be1f960156bfb76899a8e4bcccf (diff) | |
Make GrDrawState object used by GrDrawTarget be settable; set in GrInOrderDrawBuffer playback
Review URL: http://codereview.appspot.com/5908062/
git-svn-id: http://skia.googlecode.com/svn/trunk@3503 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl')
| -rw-r--r-- | src/gpu/gl/GrGpuGL.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp index 10b42c06e4..8754ac3d90 100644 --- a/src/gpu/gl/GrGpuGL.cpp +++ b/src/gpu/gl/GrGpuGL.cpp @@ -1911,7 +1911,7 @@ void GrGpuGL::flushBlend(GrPrimitiveType type, gXfermodeCoeff2Blend[dstCoeff])); fHWDrawState.setBlendFunc(srcCoeff, dstCoeff); } - GrColor blendConst = fCurrDrawState.getBlendConstant(); + GrColor blendConst = this->getDrawState().getBlendConstant(); if ((BlendCoeffReferencesConstant(srcCoeff) || BlendCoeffReferencesConstant(dstCoeff)) && fHWDrawState.getBlendConstant() != blendConst) { @@ -2099,7 +2099,7 @@ bool GrGpuGL::flushGLStateCommon(GrPrimitiveType type) { } if (fHWDrawState.getDrawFace() != drawState->getDrawFace()) { - switch (fCurrDrawState.getDrawFace()) { + switch (this->getDrawState().getDrawFace()) { case GrDrawState::kCCW_DrawFace: GL_CALL(Enable(GR_GL_CULL_FACE)); GL_CALL(CullFace(GR_GL_BACK)); @@ -2178,7 +2178,7 @@ void GrGpuGL::notifyTextureDelete(GrGLTexture* texture) { for (int s = 0; s < GrDrawState::kNumStages; ++s) { GrDrawState* drawState = this->drawState(); if (drawState->getTexture(s) == texture) { - fCurrDrawState.setTexture(s, NULL); + this->drawState()->setTexture(s, NULL); } if (fHWDrawState.getTexture(s) == texture) { // deleting bound texture does implied bind to 0 |