diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-27 14:34:08 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-27 14:34:08 +0000 |
| commit | 290e5363bb630be97bcf6777be77a7ca9b04f3c1 (patch) | |
| tree | 9ef741fbc2e282db39a03c46ea5fa4e2af0e5868 /src/gpu/gl/GrGpuGL.cpp | |
| parent | 67bddc497e30034c78e08de1f35502293a885596 (diff) | |
Revert 3503
git-svn-id: http://skia.googlecode.com/svn/trunk@3504 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl/GrGpuGL.cpp')
| -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 8754ac3d90..10b42c06e4 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 = this->getDrawState().getBlendConstant(); + GrColor blendConst = fCurrDrawState.getBlendConstant(); if ((BlendCoeffReferencesConstant(srcCoeff) || BlendCoeffReferencesConstant(dstCoeff)) && fHWDrawState.getBlendConstant() != blendConst) { @@ -2099,7 +2099,7 @@ bool GrGpuGL::flushGLStateCommon(GrPrimitiveType type) { } if (fHWDrawState.getDrawFace() != drawState->getDrawFace()) { - switch (this->getDrawState().getDrawFace()) { + switch (fCurrDrawState.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) { - this->drawState()->setTexture(s, NULL); + fCurrDrawState.setTexture(s, NULL); } if (fHWDrawState.getTexture(s) == texture) { // deleting bound texture does implied bind to 0 |