diff options
| author | Jason Sams <rjsams@android.com> | 2010-02-22 15:37:51 -0800 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2010-02-22 15:37:51 -0800 |
| commit | ef21edcc70fc2734a3dc7995d3c3af1f90d16ef8 (patch) | |
| tree | 5b349a64e3050252325f713ffb775457684eb63b /rsProgramFragment.cpp | |
| parent | b91ff26cb9b302f2a6573ab9ba75abbb4451d01c (diff) | |
| download | android_frameworks_rs-ef21edcc70fc2734a3dc7995d3c3af1f90d16ef8.tar.gz android_frameworks_rs-ef21edcc70fc2734a3dc7995d3c3af1f90d16ef8.tar.bz2 android_frameworks_rs-ef21edcc70fc2734a3dc7995d3c3af1f90d16ef8.zip | |
beging np2 extension check work.
Diffstat (limited to 'rsProgramFragment.cpp')
| -rw-r--r-- | rsProgramFragment.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rsProgramFragment.cpp b/rsProgramFragment.cpp index 15f3269a..c17b94c1 100644 --- a/rsProgramFragment.cpp +++ b/rsProgramFragment.cpp @@ -109,7 +109,7 @@ void ProgramFragment::setupGL(const Context *rsc, ProgramFragmentState *state) } 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 @@ void ProgramFragment::setupGL2(const Context *rsc, ProgramFragmentState *state, 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); |