commit f9954c7eabfcbcae113a1efb8d3c525a725273b1
author Mathias Agopian <mathias@google.com> Wed Dec 15 16:59:55 2010 -0800
committer Mathias Agopian <mathias@google.com> Wed Dec 15 16:59:55 2010 -0800
tree 37a87450316ce02674e4d0e040540d20f39b0f12
parent b094b0c4a4309f48d9da7253de78ebda20a8a81c

fix [3127755] Launcher is missing anti-aliasing

Enable limited forms of mipmaping when possible.

Change-Id: I39ad90becaa4048844fdbbbcb187333e7d59fc6a

libs/rs/rsSampler.cpp

diff --git a/libs/rs/rsSampler.cpp b/libs/rs/rsSampler.cpp
index 71f508f..5693c8a 100644
--- a/libs/rs/rsSampler.cpp
+++ b/libs/rs/rsSampler.cpp
@@ -70,7 +70,11 @@
     }
 
     if ((mMinFilter == RS_SAMPLER_LINEAR_MIP_LINEAR) && forceNonMip) {
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+        if (rsc->ext_GL_IMG_texture_npot()) {
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
+        } else {
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+        }
     } else {
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, trans[mMinFilter]);
     }