From 581cc64028e8b8f66cec8105bf530b16d5fb34eb Mon Sep 17 00:00:00 2001 From: Alex Sakhartchouk Date: Wed, 27 Oct 2010 14:10:07 -0700 Subject: Adding nvidia extension for limited npot support. Updating a3d loading to be async. Change-Id: I4be71d2002b9ad6ab8896d63e625f031e6b7ea6c --- libs/rs/rsSampler.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libs/rs/rsSampler.cpp') diff --git a/libs/rs/rsSampler.cpp b/libs/rs/rsSampler.cpp index cfae7b2..cbdc407 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]); -- cgit v1.1