commit 02fb2cb531035779a25dbf9595e0628ea40585b0
author Jason Sams <rjsams@android.com> Thu May 28 15:37:57 2009 -0700
committer Jason Sams <rjsams@android.com> Thu May 28 16:16:46 2009 -0700
tree c8151779dd70e8242412a327add168a0e5444a4e
parent 206b83190708738552be7760acfeefa1143555b5

Add sampler support

libs/rs/rsProgramFragment.cpp

diff --git a/libs/rs/rsProgramFragment.cpp b/libs/rs/rsProgramFragment.cpp
index 1a6e2c7..3d316ea 100644
--- a/libs/rs/rsProgramFragment.cpp
+++ b/libs/rs/rsProgramFragment.cpp
@@ -62,14 +62,14 @@
             break;
         }
 
-//        if (mSamplers[ct].get()) {
-            //mSamplers[ct]->setupGL();
-//        } else {
+        if (mSamplers[ct].get()) {
+            mSamplers[ct]->setupGL();
+        } else {
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-        //}
+        }
     }
     glActiveTexture(GL_TEXTURE0);
 }