commit 273104028cd9c300d3486684de409a43ff48a6f4
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Nov 20 17:59:48 2013 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Nov 20 17:59:48 2013 +0000
tree 0da665f48c805f887086980f88d9d5511f8d8e85
parent f41760939f5d65ab7eb3a89d6cd821b3923dd0b2

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

src/gpu/gl/GrGLInterface.cpp

diff --git a/src/gpu/gl/GrGLInterface.cpp b/src/gpu/gl/GrGLInterface.cpp
index 7e557da..09f6a65 100644
--- a/src/gpu/gl/GrGLInterface.cpp
+++ b/src/gpu/gl/GrGLInterface.cpp
@@ -78,9 +78,7 @@
         NULL == fGenBuffers ||
         NULL == fGenTextures ||
         NULL == fGetBufferParameteriv ||
-#ifndef SKIA_IGNORE_GPU_MIPMAPS
         NULL == fGenerateMipmap ||
-#endif
         NULL == fGetError ||
         NULL == fGetIntegerv ||
         NULL == fGetProgramInfoLog ||

src/gpu/gl/GrGpuGL.cpp

diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp
index 2e325d4..0d1ea8e 100644
--- a/src/gpu/gl/GrGpuGL.cpp
+++ b/src/gpu/gl/GrGpuGL.cpp
@@ -2020,14 +2020,12 @@
     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());