diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-05 15:13:46 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-05 15:13:46 +0000 |
| commit | 492093951ae2a7d7c14aa22f48faa8942f045caf (patch) | |
| tree | 67a1855b72554cf761eb44e61bde4d3e979cd990 /src/gpu/gl/GrGpuGL.cpp | |
| parent | 691703cdd4ab51b23c59798e7018dd7920a34be3 (diff) | |
Move stuff from protected to private in GrGpuGL
Review URL: http://codereview.appspot.com/6295044/
git-svn-id: http://skia.googlecode.com/svn/trunk@4161 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl/GrGpuGL.cpp')
| -rw-r--r-- | src/gpu/gl/GrGpuGL.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp index a1cd1e08f6..bf526c9a0f 100644 --- a/src/gpu/gl/GrGpuGL.cpp +++ b/src/gpu/gl/GrGpuGL.cpp @@ -481,7 +481,7 @@ void GrGpuGL::onResetContext() { GL_CALL(LineWidth(1)); // invalid - fActiveTextureUnitIdx = -1; + fHWActiveTextureUnitIdx = -1; fHWBlendState.invalidate(); @@ -2395,16 +2395,16 @@ bool GrGpuGL::configToGLFormats(GrPixelConfig config, void GrGpuGL::setTextureUnit(int unit) { GrAssert(unit >= 0 && unit < GrDrawState::kNumStages); - if (fActiveTextureUnitIdx != unit) { + if (fHWActiveTextureUnitIdx != unit) { GL_CALL(ActiveTexture(GR_GL_TEXTURE0 + unit)); - fActiveTextureUnitIdx = unit; + fHWActiveTextureUnitIdx = unit; } } void GrGpuGL::setSpareTextureUnit() { - if (fActiveTextureUnitIdx != (GR_GL_TEXTURE0 + SPARE_TEX_UNIT)) { + if (fHWActiveTextureUnitIdx != (GR_GL_TEXTURE0 + SPARE_TEX_UNIT)) { GL_CALL(ActiveTexture(GR_GL_TEXTURE0 + SPARE_TEX_UNIT)); - fActiveTextureUnitIdx = SPARE_TEX_UNIT; + fHWActiveTextureUnitIdx = SPARE_TEX_UNIT; } } |