diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-20 17:59:48 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-20 17:59:48 +0000 |
| commit | 273104028cd9c300d3486684de409a43ff48a6f4 (patch) | |
| tree | 0da665f48c805f887086980f88d9d5511f8d8e85 /src/gpu/gl/GrGpuGL.cpp | |
| parent | f41760939f5d65ab7eb3a89d6cd821b3923dd0b2 (diff) | |
Remove the SKIA_IGNORE_GPU_MIPMAPS now that Chrome sets glGenMipmap for
the skia GL interface.
R=bsalomon@google.com, humper@google.com
Author: skaslev@chromium.org
Review URL: https://codereview.chromium.org/74783011
git-svn-id: http://skia.googlecode.com/svn/trunk@12319 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl/GrGpuGL.cpp')
| -rw-r--r-- | src/gpu/gl/GrGpuGL.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp index 2e325d486b..0d1ea8e041 100644 --- a/src/gpu/gl/GrGpuGL.cpp +++ b/src/gpu/gl/GrGpuGL.cpp @@ -2020,14 +2020,12 @@ void GrGpuGL::bindTexture(int unitIdx, const GrTextureParams& params, GrGLTextur newTexParams.fMinFilter = glMinFilterModes[params.filterMode()]; newTexParams.fMagFilter = glMagFilterModes[params.filterMode()]; -#ifndef SKIA_IGNORE_GPU_MIPMAPS if (params.filterMode() == GrTextureParams::kMipMap_FilterMode && texture->mipMapsAreDirty()) { // GL_CALL(Hint(GR_GL_GENERATE_MIPMAP_HINT,GR_GL_NICEST)); GL_CALL(GenerateMipmap(GR_GL_TEXTURE_2D)); texture->dirtyMipMaps(false); } -#endif newTexParams.fWrapS = tile_to_gl_wrap(params.getTileModeX()); newTexParams.fWrapT = tile_to_gl_wrap(params.getTileModeY()); |