diff options
| author | Jason Sams <rjsams@android.com> | 2010-09-14 14:59:03 -0700 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2010-09-14 14:59:37 -0700 |
| commit | cfc04366998cd0c626594c9cf70336a11bdf5996 (patch) | |
| tree | e49a01f8a5d333a9ba1e711e2939915c9c84dbf0 /libs/rs/rsSampler.cpp | |
| parent | 213fc950d4acef73eed6b6294b556981f516dbff (diff) | |
| download | frameworks_base-cfc04366998cd0c626594c9cf70336a11bdf5996.zip frameworks_base-cfc04366998cd0c626594c9cf70336a11bdf5996.tar.gz frameworks_base-cfc04366998cd0c626594c9cf70336a11bdf5996.tar.bz2 | |
Fix partial NP2 support and restrict mipmaps and clamp
modes on HW that does not support proper NP2
bug 2965170
Change-Id: If9a3ac45264861fc75b9616e98957e12a5464411
Diffstat (limited to 'libs/rs/rsSampler.cpp')
| -rw-r--r-- | libs/rs/rsSampler.cpp | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/libs/rs/rsSampler.cpp b/libs/rs/rsSampler.cpp index f41f295..47b8a61 100644 --- a/libs/rs/rsSampler.cpp +++ b/libs/rs/rsSampler.cpp @@ -67,25 +67,29 @@ void Sampler::setupGL(const Context *rsc, bool npot) GL_LINEAR_MIPMAP_LINEAR, //RS_SAMPLER_LINEAR_MIP_LINEAR, GL_REPEAT, //RS_SAMPLER_WRAP, GL_CLAMP_TO_EDGE, //RS_SAMPLER_CLAMP + }; + GLenum transNP[] = { + GL_NEAREST, //RS_SAMPLER_NEAREST, + GL_LINEAR, //RS_SAMPLER_LINEAR, + GL_LINEAR, //RS_SAMPLER_LINEAR_MIP_LINEAR, + GL_CLAMP_TO_EDGE, //RS_SAMPLER_WRAP, + GL_CLAMP_TO_EDGE, //RS_SAMPLER_CLAMP }; - bool forceNonMip = false; if (!rsc->ext_OES_texture_npot() && npot) { - forceNonMip = true; - } - - if ((mMinFilter == RS_SAMPLER_LINEAR_MIP_LINEAR) && forceNonMip) { - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + 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]); } else { glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, trans[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(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]); - - rsc->checkError("ProgramFragment::setupGL2 tex env"); + rsc->checkError("Sampler::setupGL2 tex env"); } void Sampler::bindToContext(SamplerState *ss, uint32_t slot) @@ -103,7 +107,7 @@ void Sampler::unbindFromContext(SamplerState *ss) void Sampler::serialize(OStream *stream) const { - + } Sampler *Sampler::createFromStream(Context *rsc, IStream *stream) |