diff options
| author | 2010-10-27 14:10:07 -0700 | |
|---|---|---|
| committer | 2010-10-27 14:10:07 -0700 | |
| commit | 581cc64028e8b8f66cec8105bf530b16d5fb34eb (patch) | |
| tree | 82d5b43ecb850ffa7b0dede58c86032fcc066d54 /libs/rs/rsSampler.cpp | |
| parent | 0424d69d484dfc25c73f6557199cfbb7aaaeb043 (diff) | |
Adding nvidia extension for limited npot support.
Updating a3d loading to be async.
Change-Id: I4be71d2002b9ad6ab8896d63e625f031e6b7ea6c
Diffstat (limited to 'libs/rs/rsSampler.cpp')
| -rw-r--r-- | libs/rs/rsSampler.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libs/rs/rsSampler.cpp b/libs/rs/rsSampler.cpp index cfae7b2abfc0..cbdc4072fbfc 100644 --- a/libs/rs/rsSampler.cpp +++ b/libs/rs/rsSampler.cpp @@ -76,7 +76,11 @@ void Sampler::setupGL(const Context *rsc, const Allocation *tex) }; if (!rsc->ext_OES_texture_npot() && tex->getType()->getIsNp2()) { - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, transNP[mMinFilter]); + if (tex->getHasGraphicsMipmaps() && rsc->ext_GL_NV_texture_npot_2D_mipmap()) { + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, trans[mMinFilter]); + } else { + glTexParameteri(GL_TEXTURE_2D, 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]); |