commit 6aef1fb4ebf8b8b2ed352eb81e961565fbbd56cb
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu May 05 12:33:22 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu May 05 12:33:22 2011 +0000
tree 765433fc75610281290c9ea6358b27428bf15468
parent 5fd9243fd6b82aa3f2a2fae7c62310e77ab7b6d3

Add 4x4 downsample filter with 4 bilinear texture reads, use for ssaa.

Review URL: http://codereview.appspot.com/4483042/

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

gpu/src/GrGpuGL.cpp

diff --git a/gpu/src/GrGpuGL.cpp b/gpu/src/GrGpuGL.cpp
index 721d084..c63c766 100644
--- a/gpu/src/GrGpuGL.cpp
+++ b/gpu/src/GrGpuGL.cpp
@@ -1754,8 +1754,12 @@
                                                 nextTexture->getTexParams();
             GrGLTexture::TexParams newTexParams;
 
-            newTexParams.fFilter = sampler.isFilter() ? GR_GL_LINEAR :
-                                                        GR_GL_NEAREST;
+            if (GrSamplerState::kNearest_Filter == sampler.getFilter()) {
+                newTexParams.fFilter = GR_GL_NEAREST;
+            } else {
+                newTexParams.fFilter = GR_GL_LINEAR;
+            }
+
             newTexParams.fWrapS =
                         GrGLTexture::WrapMode2GLWrap()[sampler.getWrapX()];
             newTexParams.fWrapT =