commit 5dbdfee3bd9033e05362399297f74bb4c14c0999
author humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jul 25 20:43:44 2013 +0000
committer humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jul 25 20:43:44 2013 +0000
tree 0b6cca2c1e108e8cbe44dae804875d39fb9c5e91
parent 47fad70da32b8654c6e37aed27815f16bcc5e2f9

reversed senses of none and bilerp

git-svn-id: http://skia.googlecode.com/svn/trunk@10373 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/gl/GrGpuGL.cpp

diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp
index 4102c8c..5b9609b 100644
--- a/src/gpu/gl/GrGpuGL.cpp
+++ b/src/gpu/gl/GrGpuGL.cpp
@@ -2006,7 +2006,7 @@
     bool setAll = timestamp < this->getResetTimestamp();
     GrGLTexture::TexParams newTexParams;
 
-    newTexParams.fFilter = (params.filterMode() == GrTextureParams::kNone_FilterMode) ? GR_GL_LINEAR : GR_GL_NEAREST;
+    newTexParams.fFilter = (params.filterMode() == GrTextureParams::kNone_FilterMode) ? GR_GL_NEAREST : GR_GL_LINEAR;
 
     newTexParams.fWrapS = tile_to_gl_wrap(params.getTileModeX());
     newTexParams.fWrapT = tile_to_gl_wrap(params.getTileModeY());