Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix build

Browse Source 
Change-Id: Ibdc45f1794e7ef60dc1ca0ff85c5cc4dff84c3fa
This commit is contained in:
Mathias Agopian
2012-01-29 22:20:50 -08:00
parent 0589e58236
commit dfbcee6cb8
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/rs/driver/rsdGL.cpp
View File

@@ -340,9 +340,9 @@ bool rsdGLInit(const Context *rsc) {
dc->gl.gl.OES_texture_npot = NULL != strstr((const char *)dc->gl.gl.extensions,
"GL_OES_texture_npot");
dc->gl.gl.GL_IMG_texture_npot = NULL != strstr((const char *)dc->gl.gl.extensions,
dc->gl.gl.IMG_texture_npot = NULL != strstr((const char *)dc->gl.gl.extensions,
"GL_IMG_texture_npot");
dc->gl.gl.GL_NV_texture_npot_2D_mipmap = NULL != strstr((const char *)dc->gl.gl.extensions,
dc->gl.gl.NV_texture_npot_2D_mipmap = NULL != strstr((const char *)dc->gl.gl.extensions,
"GL_NV_texture_npot_2D_mipmap");
dc->gl.gl.EXT_texture_max_aniso = 1.0f;
bool hasAniso = NULL != strstr((const char *)dc->gl.gl.extensions,

4
libs/rs/driver/rsdGL.h
View File

@@ -61,8 +61,8 @@ typedef struct RsdGLRec {
int32_t maxVertexTextureUnits;
bool OES_texture_npot;
bool GL_IMG_texture_npot;
bool GL_NV_texture_npot_2D_mipmap;
bool IMG_texture_npot;
bool NV_texture_npot_2D_mipmap;
float EXT_texture_max_aniso;
} gl;

4
libs/rs/driver/rsdShader.cpp
View File

@@ -349,8 +349,8 @@ void RsdShader::setupSampler(const Context *rsc, const Sampler *s, const Allocat
if (!dc->gl.gl.OES_texture_npot && tex->getType()->getIsNp2()) {
if (tex->getHasGraphicsMipmaps() &&
(dc->gl.gl.GL_NV_texture_npot_2D_mipmap || dc->gl.gl.GL_IMG_texture_npot)) {
if (dc->gl.gl.GL_NV_texture_npot_2D_mipmap) {
(dc->gl.gl.NV_texture_npot_2D_mipmap || dc->gl.gl.IMG_texture_npot)) {
if (dc->gl.gl.NV_texture_npot_2D_mipmap) {
RSD_CALL_GL(glTexParameteri, target, GL_TEXTURE_MIN_FILTER,
trans[s->mHal.state.minFilter]);
} else {