Move gles2 extensions out of dev.

BUG=none
TEST=simple usage test in nacl
Review URL: https://chromiumcodereview.appspot.com/10354004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135735 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 41 insertions, 41 deletions

diff --git a/ppapi/lib/gl/gles2/gl2ext_ppapi.c b/ppapi/lib/gl/gles2/gl2ext_ppapi.c
index b995fc6..bbd00ac 100644
--- a/ppapi/lib/gl/gles2/gl2ext_ppapi.c
+++ b/ppapi/lib/gl/gles2/gl2ext_ppapi.c
@@ -26,17 +26,17 @@
 // TODO(alokp): This will need to be thread-safe if we build gles2 as a
 // shared library.
 static const struct PPB_OpenGLES2* g_gles2_interface = NULL;
-static const struct PPB_OpenGLES2InstancedArrays_Dev*
+static const struct PPB_OpenGLES2InstancedArrays*
     g_gles2_instanced_arrays_interface = NULL;
-static const struct PPB_OpenGLES2FramebufferBlit_Dev*
+static const struct PPB_OpenGLES2FramebufferBlit*
     g_gles2_framebuffer_blit_interface = NULL;
-static const struct PPB_OpenGLES2FramebufferMultisample_Dev*
+static const struct PPB_OpenGLES2FramebufferMultisample*
     g_gles2_framebuffer_multisample_interface = NULL;
-static const struct PPB_OpenGLES2ChromiumEnableFeature_Dev*
+static const struct PPB_OpenGLES2ChromiumEnableFeature*
     g_gles2_chromium_enable_feature_interface = NULL;
-static const struct PPB_OpenGLES2ChromiumMapSub_Dev*
+static const struct PPB_OpenGLES2ChromiumMapSub*
     g_gles2_chromium_map_sub_interface = NULL;
-static const struct PPB_OpenGLES2Query_Dev*
+static const struct PPB_OpenGLES2Query*
     g_gles2_query_interface = NULL;
 
 // TODO(alokp): Make sure PP_TLS works on all supported platforms.
@@ -49,29 +49,29 @@ GLboolean GL_APIENTRY glInitializePPAPI(
   }
   if (!g_gles2_instanced_arrays_interface) {
     g_gles2_instanced_arrays_interface =
-        get_browser_interface(PPB_OPENGLES2_INSTANCEDARRAYS_DEV_INTERFACE);
+        get_browser_interface(PPB_OPENGLES2_INSTANCEDARRAYS_INTERFACE);
   }
   if (!g_gles2_framebuffer_blit_interface) {
     g_gles2_framebuffer_blit_interface =
-        get_browser_interface(PPB_OPENGLES2_FRAMEBUFFERBLIT_DEV_INTERFACE);
+        get_browser_interface(PPB_OPENGLES2_FRAMEBUFFERBLIT_INTERFACE);
   }
   if (!g_gles2_framebuffer_multisample_interface) {
     g_gles2_framebuffer_multisample_interface =
         get_browser_interface(
-            PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_DEV_INTERFACE);
+            PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_INTERFACE);
   }
   if (!g_gles2_chromium_enable_feature_interface) {
     g_gles2_chromium_enable_feature_interface =
         get_browser_interface(
-            PPB_OPENGLES2_CHROMIUMENABLEFEATURE_DEV_INTERFACE);
+            PPB_OPENGLES2_CHROMIUMENABLEFEATURE_INTERFACE);
   }
   if (!g_gles2_chromium_map_sub_interface) {
     g_gles2_chromium_map_sub_interface =
-        get_browser_interface(PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE);
+        get_browser_interface(PPB_OPENGLES2_CHROMIUMMAPSUB_INTERFACE);
   }
   if (!g_gles2_query_interface) {
     g_gles2_query_interface =
-        get_browser_interface(PPB_OPENGLES2_QUERY_DEV_INTERFACE);
+        get_browser_interface(PPB_OPENGLES2_QUERY_INTERFACE);
   }
   return g_gles2_interface ? GL_TRUE : GL_FALSE;
 }
@@ -93,32 +93,32 @@ const struct PPB_OpenGLES2* GL_APIENTRY glGetInterfacePPAPI() {
   return g_gles2_interface;
 }
 
-const struct PPB_OpenGLES2InstancedArrays_Dev* GL_APIENTRY
+const struct PPB_OpenGLES2InstancedArrays* GL_APIENTRY
     glGetInstancedArraysInterfacePPAPI() {
   return g_gles2_instanced_arrays_interface;
 }
 
-const struct PPB_OpenGLES2FramebufferBlit_Dev* GL_APIENTRY
+const struct PPB_OpenGLES2FramebufferBlit* GL_APIENTRY
     glGetFramebufferBlitInterfacePPAPI() {
   return g_gles2_framebuffer_blit_interface;
 }
 
-const struct PPB_OpenGLES2FramebufferMultisample_Dev* GL_APIENTRY
+const struct PPB_OpenGLES2FramebufferMultisample* GL_APIENTRY
     glGetFramebufferMultisampleInterfacePPAPI() {
   return g_gles2_framebuffer_multisample_interface;
 }
 
-const struct PPB_OpenGLES2ChromiumEnableFeature_Dev* GL_APIENTRY
+const struct PPB_OpenGLES2ChromiumEnableFeature* GL_APIENTRY
     glGetChromiumEnableFeatureInterfacePPAPI() {
   return g_gles2_chromium_enable_feature_interface;
 }
 
-const struct PPB_OpenGLES2ChromiumMapSub_Dev* GL_APIENTRY
+const struct PPB_OpenGLES2ChromiumMapSub* GL_APIENTRY
     glGetChromiumMapSubInterfacePPAPI() {
   return g_gles2_chromium_map_sub_interface;
 }
 
-const struct PPB_OpenGLES2Query_Dev* GL_APIENTRY
+const struct PPB_OpenGLES2Query* GL_APIENTRY
     glGetQueryInterfacePPAPI() {
   return g_gles2_query_interface;
 }
diff --git a/ppapi/lib/gl/gles2/gl2ext_ppapi.h b/ppapi/lib/gl/gles2/gl2ext_ppapi.h
index 40feca0..9b99c7e 100644
--- a/ppapi/lib/gl/gles2/gl2ext_ppapi.h
+++ b/ppapi/lib/gl/gles2/gl2ext_ppapi.h
@@ -37,17 +37,17 @@ GL_APICALL PP_Resource GL_APIENTRY glGetCurrentContextPPAPI();
 
 // Returns OpenGL ES 2.0 interface.
 GL_APICALL const struct PPB_OpenGLES2* GL_APIENTRY glGetInterfacePPAPI();
-GL_APICALL const struct PPB_OpenGLES2InstancedArrays_Dev* GL_APIENTRY
+GL_APICALL const struct PPB_OpenGLES2InstancedArrays* GL_APIENTRY
     glGetInstancedArraysInterfacePPAPI();
-GL_APICALL const struct PPB_OpenGLES2FramebufferBlit_Dev* GL_APIENTRY
+GL_APICALL const struct PPB_OpenGLES2FramebufferBlit* GL_APIENTRY
     glGetFramebufferBlitInterfacePPAPI();
-GL_APICALL const struct PPB_OpenGLES2FramebufferMultisample_Dev* GL_APIENTRY
+GL_APICALL const struct PPB_OpenGLES2FramebufferMultisample* GL_APIENTRY
     glGetFramebufferMultisampleInterfacePPAPI();
-GL_APICALL const struct PPB_OpenGLES2ChromiumEnableFeature_Dev* GL_APIENTRY
+GL_APICALL const struct PPB_OpenGLES2ChromiumEnableFeature* GL_APIENTRY
     glGetChromiumEnableFeatureInterfacePPAPI();
-GL_APICALL const struct PPB_OpenGLES2ChromiumMapSub_Dev* GL_APIENTRY
+GL_APICALL const struct PPB_OpenGLES2ChromiumMapSub* GL_APIENTRY
     glGetChromiumMapSubInterfacePPAPI();
-GL_APICALL const struct PPB_OpenGLES2Query_Dev* GL_APIENTRY
+GL_APICALL const struct PPB_OpenGLES2Query* GL_APIENTRY
     glGetQueryInterfacePPAPI();
 
 #ifdef __cplusplus
diff --git a/ppapi/lib/gl/gles2/gles2.c b/ppapi/lib/gl/gles2/gles2.c
index 884127c..261525b 100644
--- a/ppapi/lib/gl/gles2/gles2.c
+++ b/ppapi/lib/gl/gles2/gles2.c
@@ -757,7 +757,7 @@ void GL_APIENTRY glViewport(GLint x, GLint y, GLsizei width, GLsizei height) {
 void GL_APIENTRY glBlitFramebufferEXT(
     GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0,
     GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) {
-  const struct PPB_OpenGLES2FramebufferBlit_Dev* ext =
+  const struct PPB_OpenGLES2FramebufferBlit* ext =
       glGetFramebufferBlitInterfacePPAPI();
   if (ext)
     ext->BlitFramebufferEXT(
@@ -768,7 +768,7 @@ void GL_APIENTRY glBlitFramebufferEXT(
 void GL_APIENTRY glRenderbufferStorageMultisampleEXT(
     GLenum target, GLsizei samples, GLenum internalformat, GLsizei width,
     GLsizei height) {
-  const struct PPB_OpenGLES2FramebufferMultisample_Dev* ext =
+  const struct PPB_OpenGLES2FramebufferMultisample* ext =
       glGetFramebufferMultisampleInterfacePPAPI();
   if (ext)
     ext->RenderbufferStorageMultisampleEXT(
@@ -777,51 +777,51 @@ void GL_APIENTRY glRenderbufferStorageMultisampleEXT(
 }
 
 void GL_APIENTRY glGenQueriesEXT(GLsizei n, GLuint* queries) {
-  const struct PPB_OpenGLES2Query_Dev* ext = glGetQueryInterfacePPAPI();
+  const struct PPB_OpenGLES2Query* ext = glGetQueryInterfacePPAPI();
   if (ext)
     ext->GenQueriesEXT(glGetCurrentContextPPAPI(), n, queries);
 }
 
 void GL_APIENTRY glDeleteQueriesEXT(GLsizei n, const GLuint* queries) {
-  const struct PPB_OpenGLES2Query_Dev* ext = glGetQueryInterfacePPAPI();
+  const struct PPB_OpenGLES2Query* ext = glGetQueryInterfacePPAPI();
   if (ext)
     ext->DeleteQueriesEXT(glGetCurrentContextPPAPI(), n, queries);
 }
 
 GLboolean GL_APIENTRY glIsQueryEXT(GLuint id) {
-  const struct PPB_OpenGLES2Query_Dev* ext = glGetQueryInterfacePPAPI();
+  const struct PPB_OpenGLES2Query* ext = glGetQueryInterfacePPAPI();
   if (ext)
     return ext->IsQueryEXT(glGetCurrentContextPPAPI(), id);
   return 0;
 }
 
 void GL_APIENTRY glBeginQueryEXT(GLenum target, GLuint id) {
-  const struct PPB_OpenGLES2Query_Dev* ext = glGetQueryInterfacePPAPI();
+  const struct PPB_OpenGLES2Query* ext = glGetQueryInterfacePPAPI();
   if (ext)
     ext->BeginQueryEXT(glGetCurrentContextPPAPI(), target, id);
 }
 
 void GL_APIENTRY glEndQueryEXT(GLenum target) {
-  const struct PPB_OpenGLES2Query_Dev* ext = glGetQueryInterfacePPAPI();
+  const struct PPB_OpenGLES2Query* ext = glGetQueryInterfacePPAPI();
   if (ext)
     ext->EndQueryEXT(glGetCurrentContextPPAPI(), target);
 }
 
 void GL_APIENTRY glGetQueryivEXT(GLenum target, GLenum pname, GLint* params) {
-  const struct PPB_OpenGLES2Query_Dev* ext = glGetQueryInterfacePPAPI();
+  const struct PPB_OpenGLES2Query* ext = glGetQueryInterfacePPAPI();
   if (ext)
     ext->GetQueryivEXT(glGetCurrentContextPPAPI(), target, pname, params);
 }
 
 void GL_APIENTRY glGetQueryObjectuivEXT(
     GLuint id, GLenum pname, GLuint* params) {
-  const struct PPB_OpenGLES2Query_Dev* ext = glGetQueryInterfacePPAPI();
+  const struct PPB_OpenGLES2Query* ext = glGetQueryInterfacePPAPI();
   if (ext)
     ext->GetQueryObjectuivEXT(glGetCurrentContextPPAPI(), id, pname, params);
 }
 
 GLboolean GL_APIENTRY glEnableFeatureCHROMIUM(const char* feature) {
-  const struct PPB_OpenGLES2ChromiumEnableFeature_Dev* ext =
+  const struct PPB_OpenGLES2ChromiumEnableFeature* ext =
       glGetChromiumEnableFeatureInterfacePPAPI();
   if (ext)
     return ext->EnableFeatureCHROMIUM(glGetCurrentContextPPAPI(), feature);
@@ -830,7 +830,7 @@ GLboolean GL_APIENTRY glEnableFeatureCHROMIUM(const char* feature) {
 
 void* GL_APIENTRY glMapBufferSubDataCHROMIUM(
     GLuint target, GLintptr offset, GLsizeiptr size, GLenum access) {
-  const struct PPB_OpenGLES2ChromiumMapSub_Dev* ext =
+  const struct PPB_OpenGLES2ChromiumMapSub* ext =
       glGetChromiumMapSubInterfacePPAPI();
   if (ext)
     return ext->MapBufferSubDataCHROMIUM(
@@ -839,7 +839,7 @@ void* GL_APIENTRY glMapBufferSubDataCHROMIUM(
 }
 
 void GL_APIENTRY glUnmapBufferSubDataCHROMIUM(const void* mem) {
-  const struct PPB_OpenGLES2ChromiumMapSub_Dev* ext =
+  const struct PPB_OpenGLES2ChromiumMapSub* ext =
       glGetChromiumMapSubInterfacePPAPI();
   if (ext)
     ext->UnmapBufferSubDataCHROMIUM(glGetCurrentContextPPAPI(), mem);
@@ -848,7 +848,7 @@ void GL_APIENTRY glUnmapBufferSubDataCHROMIUM(const void* mem) {
 void* GL_APIENTRY glMapTexSubImage2DCHROMIUM(
     GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
     GLsizei height, GLenum format, GLenum type, GLenum access) {
-  const struct PPB_OpenGLES2ChromiumMapSub_Dev* ext =
+  const struct PPB_OpenGLES2ChromiumMapSub* ext =
       glGetChromiumMapSubInterfacePPAPI();
   if (ext)
     return ext->MapTexSubImage2DCHROMIUM(
@@ -858,7 +858,7 @@ void* GL_APIENTRY glMapTexSubImage2DCHROMIUM(
 }
 
 void GL_APIENTRY glUnmapTexSubImage2DCHROMIUM(const void* mem) {
-  const struct PPB_OpenGLES2ChromiumMapSub_Dev* ext =
+  const struct PPB_OpenGLES2ChromiumMapSub* ext =
       glGetChromiumMapSubInterfacePPAPI();
   if (ext)
     ext->UnmapTexSubImage2DCHROMIUM(glGetCurrentContextPPAPI(), mem);
@@ -866,7 +866,7 @@ void GL_APIENTRY glUnmapTexSubImage2DCHROMIUM(const void* mem) {
 
 void GL_APIENTRY glDrawArraysInstancedANGLE(
     GLenum mode, GLint first, GLsizei count, GLsizei primcount) {
-  const struct PPB_OpenGLES2InstancedArrays_Dev* ext =
+  const struct PPB_OpenGLES2InstancedArrays* ext =
       glGetInstancedArraysInterfacePPAPI();
   if (ext)
     ext->DrawArraysInstancedANGLE(
@@ -876,7 +876,7 @@ void GL_APIENTRY glDrawArraysInstancedANGLE(
 void GL_APIENTRY glDrawElementsInstancedANGLE(
     GLenum mode, GLsizei count, GLenum type, const void* indices,
     GLsizei primcount) {
-  const struct PPB_OpenGLES2InstancedArrays_Dev* ext =
+  const struct PPB_OpenGLES2InstancedArrays* ext =
       glGetInstancedArraysInterfacePPAPI();
   if (ext)
     ext->DrawElementsInstancedANGLE(
@@ -884,7 +884,7 @@ void GL_APIENTRY glDrawElementsInstancedANGLE(
 }
 
 void GL_APIENTRY glVertexAttribDivisorANGLE(GLuint index, GLuint divisor) {
-  const struct PPB_OpenGLES2InstancedArrays_Dev* ext =
+  const struct PPB_OpenGLES2InstancedArrays* ext =
       glGetInstancedArraysInterfacePPAPI();
   if (ext)
     ext->VertexAttribDivisorANGLE(glGetCurrentContextPPAPI(), index, divisor);