commit ef21edcc70fc2734a3dc7995d3c3af1f90d16ef8
author Jason Sams <rjsams@android.com> Mon Feb 22 15:37:51 2010 -0800
committer Jason Sams <rjsams@android.com> Mon Feb 22 15:37:51 2010 -0800
tree 5b349a64e3050252325f713ffb775457684eb63b
parent b91ff26cb9b302f2a6573ab9ba75abbb4451d01c

beging np2 extension check work.

rsProgramFragment.cpp

diff --git a/rsProgramFragment.cpp b/rsProgramFragment.cpp
index 15f3269..c17b94c 100644
--- a/rsProgramFragment.cpp
+++ b/rsProgramFragment.cpp
@@ -109,7 +109,7 @@
         }
 
         if (mSamplers[ct].get()) {
-            mSamplers[ct]->setupGL(rsc);
+            mSamplers[ct]->setupGL(rsc, mTextures[ct]->getType()->getIsNp2());
         } else {
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
@@ -159,7 +159,7 @@
         glBindTexture(GL_TEXTURE_2D, mTextures[ct]->getTextureID());
         rsc->checkError("ProgramFragment::setupGL2 tex bind");
         if (mSamplers[ct].get()) {
-            mSamplers[ct]->setupGL(rsc);
+            mSamplers[ct]->setupGL(rsc, mTextures[ct]->getType()->getIsNp2());
         } else {
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);