commit 917027582745bbf27335a70360a4e6da51961978
author Mathias Agopian <mathias@google.com> Sun Jan 29 22:20:50 2012 -0800
committer Mathias Agopian <mathias@google.com> Sun Jan 29 22:22:08 2012 -0800
tree fc272d1cb01d5d8136b4a3e60e7ebe7858f32301
parent dc5daec260d51b3bd35d0e731f462228e8d8bb7b

fix build

Change-Id: Ibdc45f1794e7ef60dc1ca0ff85c5cc4dff84c3fa

driver/rsdGL.cpp

diff --git a/driver/rsdGL.cpp b/driver/rsdGL.cpp
index b53a68c..7acc054 100644
--- a/driver/rsdGL.cpp
+++ b/driver/rsdGL.cpp
@@ -340,9 +340,9 @@
 
     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,

driver/rsdGL.h

diff --git a/driver/rsdGL.h b/driver/rsdGL.h
index fc33885..51893c3 100644
--- a/driver/rsdGL.h
+++ b/driver/rsdGL.h
@@ -61,8 +61,8 @@
         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;
 

driver/rsdShader.cpp

diff --git a/driver/rsdShader.cpp b/driver/rsdShader.cpp
index a10deb4..c70193a 100644
--- a/driver/rsdShader.cpp
+++ b/driver/rsdShader.cpp
@@ -349,8 +349,8 @@
 
     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 {