commit 67f2e442a31b8395e3c1951f8e91139ec7f2be99
author Alex Sakhartchouk <alexst@google.com> Thu Nov 18 15:22:43 2010 -0800
committer Alex Sakhartchouk <alexst@google.com> Thu Nov 18 15:27:28 2010 -0800
tree 9e3001eb5181faec98ac13fa85c7915fb8c96c1a
parent 3d019afcdb167a04d9c879285b448f9be1de3c67

Support for cubemaps.

Change-Id: Iaf6087f614451a8e233b3e5bc49c834ab0ad08ee

libs/rs/rsSampler.cpp

diff --git a/libs/rs/rsSampler.cpp b/libs/rs/rsSampler.cpp
index 1d0d270..54282a8 100644
--- a/libs/rs/rsSampler.cpp
+++ b/libs/rs/rsSampler.cpp
@@ -71,29 +71,32 @@
         GL_CLAMP_TO_EDGE, //RS_SAMPLER_CLAMP
     };
 
+    // This tells us the correct texture type
+    GLenum target = (GLenum)tex->getGLTarget();
+
     if (!rsc->ext_OES_texture_npot() && tex->getType()->getIsNp2()) {
         if (tex->getHasGraphicsMipmaps() && rsc->ext_GL_NV_texture_npot_2D_mipmap()) {
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, trans[mMinFilter]);
+            glTexParameteri(target, GL_TEXTURE_MIN_FILTER, trans[mMinFilter]);
         } else {
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, transNP[mMinFilter]);
+            glTexParameteri(target, GL_TEXTURE_MIN_FILTER, transNP[mMinFilter]);
         }
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, transNP[mMagFilter]);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, transNP[mWrapS]);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, transNP[mWrapT]);
+        glTexParameteri(target, GL_TEXTURE_MAG_FILTER, transNP[mMagFilter]);
+        glTexParameteri(target, GL_TEXTURE_WRAP_S, transNP[mWrapS]);
+        glTexParameteri(target, GL_TEXTURE_WRAP_T, transNP[mWrapT]);
     } else {
         if (tex->getHasGraphicsMipmaps()) {
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, trans[mMinFilter]);
+            glTexParameteri(target, GL_TEXTURE_MIN_FILTER, trans[mMinFilter]);
         } else {
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, transNP[mMinFilter]);
+            glTexParameteri(target, GL_TEXTURE_MIN_FILTER, transNP[mMinFilter]);
         }
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, trans[mMagFilter]);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, trans[mWrapS]);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, trans[mWrapT]);
+        glTexParameteri(target, GL_TEXTURE_MAG_FILTER, trans[mMagFilter]);
+        glTexParameteri(target, GL_TEXTURE_WRAP_S, trans[mWrapS]);
+        glTexParameteri(target, GL_TEXTURE_WRAP_T, trans[mWrapT]);
     }
 
     float anisoValue = rsMin(rsc->ext_texture_max_aniso(), mAniso);
     if (rsc->ext_texture_max_aniso() > 1.0f) {
-        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, anisoValue);
+        glTexParameterf(target, GL_TEXTURE_MAX_ANISOTROPY_EXT, anisoValue);
     }
 
     rsc->checkError("Sampler::setupGL2 tex env");