diff options
| author | Mathias Agopian <mathias@google.com> | 2012-01-29 22:20:50 -0800 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2012-01-29 22:22:08 -0800 |
| commit | dfbcee6cb8ab9cf89b9052eb7498e453afdb1463 (patch) | |
| tree | 9198094f6c54f1c766af2c3827872c2871b89af9 /libs/rs | |
| parent | 0589e582361432f12848fdd59f8c408b7a31c35b (diff) | |
| download | frameworks_base-dfbcee6cb8ab9cf89b9052eb7498e453afdb1463.zip frameworks_base-dfbcee6cb8ab9cf89b9052eb7498e453afdb1463.tar.gz frameworks_base-dfbcee6cb8ab9cf89b9052eb7498e453afdb1463.tar.bz2 | |
fix build
Change-Id: Ibdc45f1794e7ef60dc1ca0ff85c5cc4dff84c3fa
Diffstat (limited to 'libs/rs')
| -rw-r--r-- | libs/rs/driver/rsdGL.cpp | 4 | ||||
| -rw-r--r-- | libs/rs/driver/rsdGL.h | 4 | ||||
| -rw-r--r-- | libs/rs/driver/rsdShader.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libs/rs/driver/rsdGL.cpp b/libs/rs/driver/rsdGL.cpp index b53a68c..7acc054 100644 --- a/libs/rs/driver/rsdGL.cpp +++ b/libs/rs/driver/rsdGL.cpp @@ -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, diff --git a/libs/rs/driver/rsdGL.h b/libs/rs/driver/rsdGL.h index fc33885..51893c3 100644 --- a/libs/rs/driver/rsdGL.h +++ b/libs/rs/driver/rsdGL.h @@ -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; diff --git a/libs/rs/driver/rsdShader.cpp b/libs/rs/driver/rsdShader.cpp index a10deb4..c70193a 100644 --- a/libs/rs/driver/rsdShader.cpp +++ b/libs/rs/driver/rsdShader.cpp @@ -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 { |