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, 79 insertions, 73 deletions

diff --git a/ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h b/ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h
index e07e870..7bdbaf2 100644
--- a/ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h
+++ b/ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h
@@ -13,8 +13,14 @@
 #define PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE \
     PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE_0_1
 
-// This interface is deprecated. Please use
-// PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE_1_0 instead.
+// PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE is deprecated. Please use
+// PPB_OPENGLES2_CHROMIUMMAPSUB_INTERFACE instead.
+
+#define PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE_1_0 \
+    "PPB_OpenGLES2ChromiumMapSub(Dev);1.0"
+
+// PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE_1_0 is also deprecated.  Please
+// use PPB_OPENGLES2_CHROMIUMMAPSUB_INTERFACE instead.
 
 struct PPB_GLESChromiumTextureMapping_Dev_0_1 {
   // Maps the sub-image of a texture. 'level', 'xoffset', 'yoffset', 'width',
diff --git a/ppapi/c/dev/ppb_opengles2ext_dev.h b/ppapi/c/dev/ppb_opengles2ext_dev.h
index 8c7eee3..9696c63 100644
--- a/ppapi/c/dev/ppb_opengles2ext_dev.h
+++ b/ppapi/c/dev/ppb_opengles2ext_dev.h
@@ -13,76 +13,5 @@
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/ppb_opengles2.h"
 
-#define PPB_OPENGLES2_INSTANCEDARRAYS_DEV_INTERFACE_1_0 "PPB_OpenGLES2InstancedArrays(Dev);1.0"  // NOLINT
-#define PPB_OPENGLES2_INSTANCEDARRAYS_DEV_INTERFACE PPB_OPENGLES2_INSTANCEDARRAYS_DEV_INTERFACE_1_0  // NOLINT
-
-struct PPB_OpenGLES2InstancedArrays_Dev {
-  void (*DrawArraysInstancedANGLE)(
-      PP_Resource context, GLenum mode, GLint first, GLsizei count,
-      GLsizei primcount);
-  void (*DrawElementsInstancedANGLE)(
-      PP_Resource context, GLenum mode, GLsizei count, GLenum type,
-      const void* indices, GLsizei primcount);
-  void (*VertexAttribDivisorANGLE)(
-      PP_Resource context, GLuint index, GLuint divisor);
-};
-
-#define PPB_OPENGLES2_FRAMEBUFFERBLIT_DEV_INTERFACE_1_0 "PPB_OpenGLES2FramebufferBlit(Dev);1.0"  // NOLINT
-#define PPB_OPENGLES2_FRAMEBUFFERBLIT_DEV_INTERFACE PPB_OPENGLES2_FRAMEBUFFERBLIT_DEV_INTERFACE_1_0  // NOLINT
-
-struct PPB_OpenGLES2FramebufferBlit_Dev {
-  void (*BlitFramebufferEXT)(
-      PP_Resource context, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
-      GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask,
-      GLenum filter);
-};
-
-#define PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_DEV_INTERFACE_1_0 "PPB_OpenGLES2FramebufferMultisample(Dev);1.0"  // NOLINT
-#define PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_DEV_INTERFACE PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_DEV_INTERFACE_1_0  // NOLINT
-
-struct PPB_OpenGLES2FramebufferMultisample_Dev {
-  void (*RenderbufferStorageMultisampleEXT)(
-      PP_Resource context, GLenum target, GLsizei samples,
-      GLenum internalformat, GLsizei width, GLsizei height);
-};
-
-#define PPB_OPENGLES2_CHROMIUMENABLEFEATURE_DEV_INTERFACE_1_0 "PPB_OpenGLES2ChromiumEnableFeature(Dev);1.0"  // NOLINT
-#define PPB_OPENGLES2_CHROMIUMENABLEFEATURE_DEV_INTERFACE PPB_OPENGLES2_CHROMIUMENABLEFEATURE_DEV_INTERFACE_1_0  // NOLINT
-
-struct PPB_OpenGLES2ChromiumEnableFeature_Dev {
-  GLboolean (*EnableFeatureCHROMIUM)(PP_Resource context, const char* feature);
-};
-
-#define PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE_1_0 "PPB_OpenGLES2ChromiumMapSub(Dev);1.0"  // NOLINT
-#define PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE_1_0  // NOLINT
-
-struct PPB_OpenGLES2ChromiumMapSub_Dev {
-  void* (*MapBufferSubDataCHROMIUM)(
-      PP_Resource context, GLuint target, GLintptr offset, GLsizeiptr size,
-      GLenum access);
-  void (*UnmapBufferSubDataCHROMIUM)(PP_Resource context, const void* mem);
-  void* (*MapTexSubImage2DCHROMIUM)(
-      PP_Resource context, GLenum target, GLint level, GLint xoffset,
-      GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type,
-      GLenum access);
-  void (*UnmapTexSubImage2DCHROMIUM)(PP_Resource context, const void* mem);
-};
-
-#define PPB_OPENGLES2_QUERY_DEV_INTERFACE_1_0 "PPB_OpenGLES2Query(Dev);1.0"
-#define PPB_OPENGLES2_QUERY_DEV_INTERFACE PPB_OPENGLES2_QUERY_DEV_INTERFACE_1_0
-
-struct PPB_OpenGLES2Query_Dev {
-  void (*GenQueriesEXT)(PP_Resource context, GLsizei n, GLuint* queries);
-  void (*DeleteQueriesEXT)(
-      PP_Resource context, GLsizei n, const GLuint* queries);
-  GLboolean (*IsQueryEXT)(PP_Resource context, GLuint id);
-  void (*BeginQueryEXT)(PP_Resource context, GLenum target, GLuint id);
-  void (*EndQueryEXT)(PP_Resource context, GLenum target);
-  void (*GetQueryivEXT)(
-      PP_Resource context, GLenum target, GLenum pname, GLint* params);
-  void (*GetQueryObjectuivEXT)(
-      PP_Resource context, GLuint id, GLenum pname, GLuint* params);
-};
-
 #endif  // C_DEV_PPB_OPENGLES2EXT_DEV_H_
 
diff --git a/ppapi/c/ppb_opengles2.h b/ppapi/c/ppb_opengles2.h
index 8d7367b..fbfe846 100644
--- a/ppapi/c/ppb_opengles2.h
+++ b/ppapi/c/ppb_opengles2.h
@@ -302,5 +302,76 @@ struct PPB_OpenGLES2 {
       PP_Resource context, GLint x, GLint y, GLsizei width, GLsizei height);
 };
 
+#define PPB_OPENGLES2_INSTANCEDARRAYS_INTERFACE_1_0 "PPB_OpenGLES2InstancedArrays;1.0"  // NOLINT
+#define PPB_OPENGLES2_INSTANCEDARRAYS_INTERFACE PPB_OPENGLES2_INSTANCEDARRAYS_INTERFACE_1_0  // NOLINT
+
+struct PPB_OpenGLES2InstancedArrays {
+  void (*DrawArraysInstancedANGLE)(
+      PP_Resource context, GLenum mode, GLint first, GLsizei count,
+      GLsizei primcount);
+  void (*DrawElementsInstancedANGLE)(
+      PP_Resource context, GLenum mode, GLsizei count, GLenum type,
+      const void* indices, GLsizei primcount);
+  void (*VertexAttribDivisorANGLE)(
+      PP_Resource context, GLuint index, GLuint divisor);
+};
+
+#define PPB_OPENGLES2_FRAMEBUFFERBLIT_INTERFACE_1_0 "PPB_OpenGLES2FramebufferBlit;1.0"  // NOLINT
+#define PPB_OPENGLES2_FRAMEBUFFERBLIT_INTERFACE PPB_OPENGLES2_FRAMEBUFFERBLIT_INTERFACE_1_0  // NOLINT
+
+struct PPB_OpenGLES2FramebufferBlit {
+  void (*BlitFramebufferEXT)(
+      PP_Resource context, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
+      GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask,
+      GLenum filter);
+};
+
+#define PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_INTERFACE_1_0 "PPB_OpenGLES2FramebufferMultisample;1.0"  // NOLINT
+#define PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_INTERFACE PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_INTERFACE_1_0  // NOLINT
+
+struct PPB_OpenGLES2FramebufferMultisample {
+  void (*RenderbufferStorageMultisampleEXT)(
+      PP_Resource context, GLenum target, GLsizei samples,
+      GLenum internalformat, GLsizei width, GLsizei height);
+};
+
+#define PPB_OPENGLES2_CHROMIUMENABLEFEATURE_INTERFACE_1_0 "PPB_OpenGLES2ChromiumEnableFeature;1.0"  // NOLINT
+#define PPB_OPENGLES2_CHROMIUMENABLEFEATURE_INTERFACE PPB_OPENGLES2_CHROMIUMENABLEFEATURE_INTERFACE_1_0  // NOLINT
+
+struct PPB_OpenGLES2ChromiumEnableFeature {
+  GLboolean (*EnableFeatureCHROMIUM)(PP_Resource context, const char* feature);
+};
+
+#define PPB_OPENGLES2_CHROMIUMMAPSUB_INTERFACE_1_0 "PPB_OpenGLES2ChromiumMapSub;1.0"  // NOLINT
+#define PPB_OPENGLES2_CHROMIUMMAPSUB_INTERFACE PPB_OPENGLES2_CHROMIUMMAPSUB_INTERFACE_1_0  // NOLINT
+
+struct PPB_OpenGLES2ChromiumMapSub {
+  void* (*MapBufferSubDataCHROMIUM)(
+      PP_Resource context, GLuint target, GLintptr offset, GLsizeiptr size,
+      GLenum access);
+  void (*UnmapBufferSubDataCHROMIUM)(PP_Resource context, const void* mem);
+  void* (*MapTexSubImage2DCHROMIUM)(
+      PP_Resource context, GLenum target, GLint level, GLint xoffset,
+      GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type,
+      GLenum access);
+  void (*UnmapTexSubImage2DCHROMIUM)(PP_Resource context, const void* mem);
+};
+
+#define PPB_OPENGLES2_QUERY_INTERFACE_1_0 "PPB_OpenGLES2Query;1.0"
+#define PPB_OPENGLES2_QUERY_INTERFACE PPB_OPENGLES2_QUERY_INTERFACE_1_0
+
+struct PPB_OpenGLES2Query {
+  void (*GenQueriesEXT)(PP_Resource context, GLsizei n, GLuint* queries);
+  void (*DeleteQueriesEXT)(
+      PP_Resource context, GLsizei n, const GLuint* queries);
+  GLboolean (*IsQueryEXT)(PP_Resource context, GLuint id);
+  void (*BeginQueryEXT)(PP_Resource context, GLenum target, GLuint id);
+  void (*EndQueryEXT)(PP_Resource context, GLenum target);
+  void (*GetQueryivEXT)(
+      PP_Resource context, GLenum target, GLenum pname, GLint* params);
+  void (*GetQueryObjectuivEXT)(
+      PP_Resource context, GLuint id, GLenum pname, GLuint* params);
+};
+
 #endif  // PPAPI_C_PPB_OPENGLES2_H_