Renamed ppb_opengles.h to ppb_opengles2.h.

Review URL: http://codereview.chromium.org/7888051

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

11 files changed, 330 insertions, 305 deletions

diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py
index f385220..f4cd5f2 100755
--- a/gpu/command_buffer/build_gles2_cmd_buffer.py
+++ b/gpu/command_buffer/build_gles2_cmd_buffer.py
@@ -1750,15 +1750,23 @@ _FUNCTION_INFO = {
   },
   'Placeholder447CHROMIUM': {
     'type': 'UnknownCommand',
+    'extension': True,
+    'chromium': True,
   },
   'Placeholder451CHROMIUM': {
     'type': 'UnknownCommand',
+    'extension': True,
+    'chromium': True,
   },
   'Placeholder452CHROMIUM': {
     'type': 'UnknownCommand',
+    'extension': True,
+    'chromium': True,
   },
   'Placeholder453CHROMIUM': {
     'type': 'UnknownCommand',
+    'extension': True,
+    'chromium': True,
   },
 }
 
@@ -5705,8 +5713,8 @@ const size_t GLES2Util::enum_to_string_table_len_ =
       file.Write("typedef %s %s;\n" % (v, k))
     file.Write("#endif  // __gl2_h_\n\n")
 
-    file.Write("#define PPB_OPENGLES2_INTERFACE "
-        "\"PPB_OpenGLES;2.0\"\n")
+    file.Write("#define PPB_OPENGLES2_INTERFACE_1_0 \"PPB_OpenGLES2;1.0\"\n")
+    file.Write("#define PPB_OPENGLES2_INTERFACE PPB_OPENGLES2_INTERFACE_1_0\n")
 
     file.Write("\nstruct PPB_OpenGLES2 {\n")
     for func in self.original_functions:
@@ -5913,7 +5921,7 @@ def main(argv):
   if options.alternate_mode == "ppapi":
     # To trigger this action, do "make ppapi_gles_bindings"
     os.chdir("ppapi");
-    gen.WritePepperGLES2Interface("c/dev/ppb_opengles_dev.h")
+    gen.WritePepperGLES2Interface("c/ppb_opengles2.h")
     gen.WriteGLES2ToPPAPIBridge("lib/gl/gles2/gles2.c")
 
   elif options.alternate_mode == "chrome_ppapi":
diff --git a/ppapi/c/dev/pp_video_dev.h b/ppapi/c/dev/pp_video_dev.h
index 04e8643..eed1575 100644
--- a/ppapi/c/dev/pp_video_dev.h
+++ b/ppapi/c/dev/pp_video_dev.h
@@ -11,7 +11,7 @@
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_size.h"
 #include "ppapi/c/pp_stdint.h"
-#include "ppapi/c/ppb_opengles.h"
+#include "ppapi/c/ppb_opengles2.h"
 
 // Video decoder configuration-related enums.
 
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 bba6826..616f661 100644
--- a/ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h
+++ b/ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h
@@ -6,7 +6,7 @@
 #define PPAPI_C_DEV_PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_H_
 
 #include "ppapi/c/pp_resource.h"
-#include "ppapi/c/ppb_opengles.h"
+#include "ppapi/c/ppb_opengles2.h"
 
 #define PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE_0_1 \
     "PPB_GLESChromiumTextureMapping(Dev);0.1"
diff --git a/ppapi/c/ppb_opengles.h b/ppapi/c/ppb_opengles.h
index 2d6923e..cd2325a 100644
--- a/ppapi/c/ppb_opengles.h
+++ b/ppapi/c/ppb_opengles.h
@@ -2,304 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// This file is auto-generated. DO NOT EDIT!
+// This file is deprecated. Please include ppb_opengles2.h directly.
+// TODO(alokp): Delete this file.
 
-// OpenGL ES interface.
 #ifndef PPAPI_C_PPB_OPENGLES_H_
 #define PPAPI_C_PPB_OPENGLES_H_
 
-#include "ppapi/c/pp_resource.h"
-#include "ppapi/c/pp_stdint.h"
-
-#ifndef __gl2_h_
-typedef unsigned int GLenum;
-typedef void GLvoid;
-typedef long int GLintptr;
-typedef int GLsizei;
-typedef long int GLsizeiptr;
-typedef int GLint;
-typedef unsigned char GLboolean;
-typedef unsigned int GLuint;
-typedef unsigned int GLbitfield;
-typedef short GLshort;
-typedef float GLfloat;
-typedef float GLclampf;
-typedef int8_t GLbyte;
-typedef uint8_t GLubyte;
-typedef int32_t GLfixed;
-typedef unsigned short GLushort;
-typedef int GLclampx;
-#endif  // __gl2_h_
-
-#define PPB_OPENGLES2_INTERFACE_1_0 "PPB_OpenGLES2;1.0"
-#define PPB_OPENGLES2_INTERFACE PPB_OPENGLES2_INTERFACE_1_0
-
-struct PPB_OpenGLES2 {
-  void (*ActiveTexture)(PP_Resource context, GLenum texture);
-  void (*AttachShader)(PP_Resource context, GLuint program, GLuint shader);
-  void (*BindAttribLocation)(
-      PP_Resource context, GLuint program, GLuint index, const char* name);
-  void (*BindBuffer)(PP_Resource context, GLenum target, GLuint buffer);
-  void (*BindFramebuffer)(
-      PP_Resource context, GLenum target, GLuint framebuffer);
-  void (*BindRenderbuffer)(
-      PP_Resource context, GLenum target, GLuint renderbuffer);
-  void (*BindTexture)(PP_Resource context, GLenum target, GLuint texture);
-  void (*BlendColor)(
-      PP_Resource context, GLclampf red, GLclampf green, GLclampf blue,
-      GLclampf alpha);
-  void (*BlendEquation)(PP_Resource context, GLenum mode);
-  void (*BlendEquationSeparate)(
-      PP_Resource context, GLenum modeRGB, GLenum modeAlpha);
-  void (*BlendFunc)(PP_Resource context, GLenum sfactor, GLenum dfactor);
-  void (*BlendFuncSeparate)(
-      PP_Resource context, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha,
-      GLenum dstAlpha);
-  void (*BufferData)(
-      PP_Resource context, GLenum target, GLsizeiptr size, const void* data,
-      GLenum usage);
-  void (*BufferSubData)(
-      PP_Resource context, GLenum target, GLintptr offset, GLsizeiptr size,
-      const void* data);
-  GLenum (*CheckFramebufferStatus)(PP_Resource context, GLenum target);
-  void (*Clear)(PP_Resource context, GLbitfield mask);
-  void (*ClearColor)(
-      PP_Resource context, GLclampf red, GLclampf green, GLclampf blue,
-      GLclampf alpha);
-  void (*ClearDepthf)(PP_Resource context, GLclampf depth);
-  void (*ClearStencil)(PP_Resource context, GLint s);
-  void (*ColorMask)(
-      PP_Resource context, GLboolean red, GLboolean green, GLboolean blue,
-      GLboolean alpha);
-  void (*CompileShader)(PP_Resource context, GLuint shader);
-  void (*CompressedTexImage2D)(
-      PP_Resource context, GLenum target, GLint level, GLenum internalformat,
-      GLsizei width, GLsizei height, GLint border, GLsizei imageSize,
-      const void* data);
-  void (*CompressedTexSubImage2D)(
-      PP_Resource context, GLenum target, GLint level, GLint xoffset,
-      GLint yoffset, GLsizei width, GLsizei height, GLenum format,
-      GLsizei imageSize, const void* data);
-  void (*CopyTexImage2D)(
-      PP_Resource context, GLenum target, GLint level, GLenum internalformat,
-      GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-  void (*CopyTexSubImage2D)(
-      PP_Resource context, GLenum target, GLint level, GLint xoffset,
-      GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-  GLuint (*CreateProgram)(PP_Resource context);
-  GLuint (*CreateShader)(PP_Resource context, GLenum type);
-  void (*CullFace)(PP_Resource context, GLenum mode);
-  void (*DeleteBuffers)(PP_Resource context, GLsizei n, const GLuint* buffers);
-  void (*DeleteFramebuffers)(
-      PP_Resource context, GLsizei n, const GLuint* framebuffers);
-  void (*DeleteProgram)(PP_Resource context, GLuint program);
-  void (*DeleteRenderbuffers)(
-      PP_Resource context, GLsizei n, const GLuint* renderbuffers);
-  void (*DeleteShader)(PP_Resource context, GLuint shader);
-  void (*DeleteTextures)(
-      PP_Resource context, GLsizei n, const GLuint* textures);
-  void (*DepthFunc)(PP_Resource context, GLenum func);
-  void (*DepthMask)(PP_Resource context, GLboolean flag);
-  void (*DepthRangef)(PP_Resource context, GLclampf zNear, GLclampf zFar);
-  void (*DetachShader)(PP_Resource context, GLuint program, GLuint shader);
-  void (*Disable)(PP_Resource context, GLenum cap);
-  void (*DisableVertexAttribArray)(PP_Resource context, GLuint index);
-  void (*DrawArrays)(
-      PP_Resource context, GLenum mode, GLint first, GLsizei count);
-  void (*DrawElements)(
-      PP_Resource context, GLenum mode, GLsizei count, GLenum type,
-      const void* indices);
-  void (*Enable)(PP_Resource context, GLenum cap);
-  void (*EnableVertexAttribArray)(PP_Resource context, GLuint index);
-  void (*Finish)(PP_Resource context);
-  void (*Flush)(PP_Resource context);
-  void (*FramebufferRenderbuffer)(
-      PP_Resource context, GLenum target, GLenum attachment,
-      GLenum renderbuffertarget, GLuint renderbuffer);
-  void (*FramebufferTexture2D)(
-      PP_Resource context, GLenum target, GLenum attachment, GLenum textarget,
-      GLuint texture, GLint level);
-  void (*FrontFace)(PP_Resource context, GLenum mode);
-  void (*GenBuffers)(PP_Resource context, GLsizei n, GLuint* buffers);
-  void (*GenerateMipmap)(PP_Resource context, GLenum target);
-  void (*GenFramebuffers)(
-      PP_Resource context, GLsizei n, GLuint* framebuffers);
-  void (*GenRenderbuffers)(
-      PP_Resource context, GLsizei n, GLuint* renderbuffers);
-  void (*GenTextures)(PP_Resource context, GLsizei n, GLuint* textures);
-  void (*GetActiveAttrib)(
-      PP_Resource context, GLuint program, GLuint index, GLsizei bufsize,
-      GLsizei* length, GLint* size, GLenum* type, char* name);
-  void (*GetActiveUniform)(
-      PP_Resource context, GLuint program, GLuint index, GLsizei bufsize,
-      GLsizei* length, GLint* size, GLenum* type, char* name);
-  void (*GetAttachedShaders)(
-      PP_Resource context, GLuint program, GLsizei maxcount, GLsizei* count,
-      GLuint* shaders);
-  GLint (*GetAttribLocation)(
-      PP_Resource context, GLuint program, const char* name);
-  void (*GetBooleanv)(PP_Resource context, GLenum pname, GLboolean* params);
-  void (*GetBufferParameteriv)(
-      PP_Resource context, GLenum target, GLenum pname, GLint* params);
-  GLenum (*GetError)(PP_Resource context);
-  void (*GetFloatv)(PP_Resource context, GLenum pname, GLfloat* params);
-  void (*GetFramebufferAttachmentParameteriv)(
-      PP_Resource context, GLenum target, GLenum attachment, GLenum pname,
-      GLint* params);
-  void (*GetIntegerv)(PP_Resource context, GLenum pname, GLint* params);
-  void (*GetProgramiv)(
-      PP_Resource context, GLuint program, GLenum pname, GLint* params);
-  void (*GetProgramInfoLog)(
-      PP_Resource context, GLuint program, GLsizei bufsize, GLsizei* length,
-      char* infolog);
-  void (*GetRenderbufferParameteriv)(
-      PP_Resource context, GLenum target, GLenum pname, GLint* params);
-  void (*GetShaderiv)(
-      PP_Resource context, GLuint shader, GLenum pname, GLint* params);
-  void (*GetShaderInfoLog)(
-      PP_Resource context, GLuint shader, GLsizei bufsize, GLsizei* length,
-      char* infolog);
-  void (*GetShaderPrecisionFormat)(
-      PP_Resource context, GLenum shadertype, GLenum precisiontype,
-      GLint* range, GLint* precision);
-  void (*GetShaderSource)(
-      PP_Resource context, GLuint shader, GLsizei bufsize, GLsizei* length,
-      char* source);
-  const GLubyte* (*GetString)(PP_Resource context, GLenum name);
-  void (*GetTexParameterfv)(
-      PP_Resource context, GLenum target, GLenum pname, GLfloat* params);
-  void (*GetTexParameteriv)(
-      PP_Resource context, GLenum target, GLenum pname, GLint* params);
-  void (*GetUniformfv)(
-      PP_Resource context, GLuint program, GLint location, GLfloat* params);
-  void (*GetUniformiv)(
-      PP_Resource context, GLuint program, GLint location, GLint* params);
-  GLint (*GetUniformLocation)(
-      PP_Resource context, GLuint program, const char* name);
-  void (*GetVertexAttribfv)(
-      PP_Resource context, GLuint index, GLenum pname, GLfloat* params);
-  void (*GetVertexAttribiv)(
-      PP_Resource context, GLuint index, GLenum pname, GLint* params);
-  void (*GetVertexAttribPointerv)(
-      PP_Resource context, GLuint index, GLenum pname, void** pointer);
-  void (*Hint)(PP_Resource context, GLenum target, GLenum mode);
-  GLboolean (*IsBuffer)(PP_Resource context, GLuint buffer);
-  GLboolean (*IsEnabled)(PP_Resource context, GLenum cap);
-  GLboolean (*IsFramebuffer)(PP_Resource context, GLuint framebuffer);
-  GLboolean (*IsProgram)(PP_Resource context, GLuint program);
-  GLboolean (*IsRenderbuffer)(PP_Resource context, GLuint renderbuffer);
-  GLboolean (*IsShader)(PP_Resource context, GLuint shader);
-  GLboolean (*IsTexture)(PP_Resource context, GLuint texture);
-  void (*LineWidth)(PP_Resource context, GLfloat width);
-  void (*LinkProgram)(PP_Resource context, GLuint program);
-  void (*PixelStorei)(PP_Resource context, GLenum pname, GLint param);
-  void (*PolygonOffset)(PP_Resource context, GLfloat factor, GLfloat units);
-  void (*ReadPixels)(
-      PP_Resource context, GLint x, GLint y, GLsizei width, GLsizei height,
-      GLenum format, GLenum type, void* pixels);
-  void (*ReleaseShaderCompiler)(PP_Resource context);
-  void (*RenderbufferStorage)(
-      PP_Resource context, GLenum target, GLenum internalformat, GLsizei width,
-      GLsizei height);
-  void (*SampleCoverage)(
-      PP_Resource context, GLclampf value, GLboolean invert);
-  void (*Scissor)(
-      PP_Resource context, GLint x, GLint y, GLsizei width, GLsizei height);
-  void (*ShaderBinary)(
-      PP_Resource context, GLsizei n, const GLuint* shaders,
-      GLenum binaryformat, const void* binary, GLsizei length);
-  void (*ShaderSource)(
-      PP_Resource context, GLuint shader, GLsizei count, const char** str,
-      const GLint* length);
-  void (*StencilFunc)(
-      PP_Resource context, GLenum func, GLint ref, GLuint mask);
-  void (*StencilFuncSeparate)(
-      PP_Resource context, GLenum face, GLenum func, GLint ref, GLuint mask);
-  void (*StencilMask)(PP_Resource context, GLuint mask);
-  void (*StencilMaskSeparate)(PP_Resource context, GLenum face, GLuint mask);
-  void (*StencilOp)(
-      PP_Resource context, GLenum fail, GLenum zfail, GLenum zpass);
-  void (*StencilOpSeparate)(
-      PP_Resource context, GLenum face, GLenum fail, GLenum zfail,
-      GLenum zpass);
-  void (*TexImage2D)(
-      PP_Resource context, GLenum target, GLint level, GLint internalformat,
-      GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type,
-      const void* pixels);
-  void (*TexParameterf)(
-      PP_Resource context, GLenum target, GLenum pname, GLfloat param);
-  void (*TexParameterfv)(
-      PP_Resource context, GLenum target, GLenum pname, const GLfloat* params);
-  void (*TexParameteri)(
-      PP_Resource context, GLenum target, GLenum pname, GLint param);
-  void (*TexParameteriv)(
-      PP_Resource context, GLenum target, GLenum pname, const GLint* params);
-  void (*TexSubImage2D)(
-      PP_Resource context, GLenum target, GLint level, GLint xoffset,
-      GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type,
-      const void* pixels);
-  void (*Uniform1f)(PP_Resource context, GLint location, GLfloat x);
-  void (*Uniform1fv)(
-      PP_Resource context, GLint location, GLsizei count, const GLfloat* v);
-  void (*Uniform1i)(PP_Resource context, GLint location, GLint x);
-  void (*Uniform1iv)(
-      PP_Resource context, GLint location, GLsizei count, const GLint* v);
-  void (*Uniform2f)(PP_Resource context, GLint location, GLfloat x, GLfloat y);
-  void (*Uniform2fv)(
-      PP_Resource context, GLint location, GLsizei count, const GLfloat* v);
-  void (*Uniform2i)(PP_Resource context, GLint location, GLint x, GLint y);
-  void (*Uniform2iv)(
-      PP_Resource context, GLint location, GLsizei count, const GLint* v);
-  void (*Uniform3f)(
-      PP_Resource context, GLint location, GLfloat x, GLfloat y, GLfloat z);
-  void (*Uniform3fv)(
-      PP_Resource context, GLint location, GLsizei count, const GLfloat* v);
-  void (*Uniform3i)(
-      PP_Resource context, GLint location, GLint x, GLint y, GLint z);
-  void (*Uniform3iv)(
-      PP_Resource context, GLint location, GLsizei count, const GLint* v);
-  void (*Uniform4f)(
-      PP_Resource context, GLint location, GLfloat x, GLfloat y, GLfloat z,
-      GLfloat w);
-  void (*Uniform4fv)(
-      PP_Resource context, GLint location, GLsizei count, const GLfloat* v);
-  void (*Uniform4i)(
-      PP_Resource context, GLint location, GLint x, GLint y, GLint z, GLint w);
-  void (*Uniform4iv)(
-      PP_Resource context, GLint location, GLsizei count, const GLint* v);
-  void (*UniformMatrix2fv)(
-      PP_Resource context, GLint location, GLsizei count, GLboolean transpose,
-      const GLfloat* value);
-  void (*UniformMatrix3fv)(
-      PP_Resource context, GLint location, GLsizei count, GLboolean transpose,
-      const GLfloat* value);
-  void (*UniformMatrix4fv)(
-      PP_Resource context, GLint location, GLsizei count, GLboolean transpose,
-      const GLfloat* value);
-  void (*UseProgram)(PP_Resource context, GLuint program);
-  void (*ValidateProgram)(PP_Resource context, GLuint program);
-  void (*VertexAttrib1f)(PP_Resource context, GLuint indx, GLfloat x);
-  void (*VertexAttrib1fv)(
-      PP_Resource context, GLuint indx, const GLfloat* values);
-  void (*VertexAttrib2f)(
-      PP_Resource context, GLuint indx, GLfloat x, GLfloat y);
-  void (*VertexAttrib2fv)(
-      PP_Resource context, GLuint indx, const GLfloat* values);
-  void (*VertexAttrib3f)(
-      PP_Resource context, GLuint indx, GLfloat x, GLfloat y, GLfloat z);
-  void (*VertexAttrib3fv)(
-      PP_Resource context, GLuint indx, const GLfloat* values);
-  void (*VertexAttrib4f)(
-      PP_Resource context, GLuint indx, GLfloat x, GLfloat y, GLfloat z,
-      GLfloat w);
-  void (*VertexAttrib4fv)(
-      PP_Resource context, GLuint indx, const GLfloat* values);
-  void (*VertexAttribPointer)(
-      PP_Resource context, GLuint indx, GLint size, GLenum type,
-      GLboolean normalized, GLsizei stride, const void* ptr);
-  void (*Viewport)(
-      PP_Resource context, GLint x, GLint y, GLsizei width, GLsizei height);
-};
+#include "ppapi/c/ppb_opengles2.h"
 
 #endif  // PPAPI_C_PPB_OPENGLES_H_
 
diff --git a/ppapi/c/ppb_opengles2.h b/ppapi/c/ppb_opengles2.h
new file mode 100644
index 0000000..ec3204a
--- /dev/null
+++ b/ppapi/c/ppb_opengles2.h
@@ -0,0 +1,306 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This file is auto-generated from
+// gpu/command_buffer/build_gles2_cmd_buffer.py
+// DO NOT EDIT!
+
+// OpenGL ES interface.
+#ifndef PPAPI_C_PPB_OPENGLES2_H_
+#define PPAPI_C_PPB_OPENGLES2_H_
+
+#include "ppapi/c/pp_resource.h"
+
+#ifndef __gl2_h_
+typedef unsigned int GLenum;
+typedef void GLvoid;
+typedef long int GLintptr;
+typedef int GLsizei;
+typedef long int GLsizeiptr;
+typedef int GLint;
+typedef unsigned char GLboolean;
+typedef unsigned int GLuint;
+typedef unsigned int GLbitfield;
+typedef short GLshort;
+typedef float GLfloat;
+typedef float GLclampf;
+typedef signed char GLbyte;
+typedef unsigned char GLubyte;
+typedef int GLfixed;
+typedef unsigned short GLushort;
+typedef int GLclampx;
+#endif  // __gl2_h_
+
+#define PPB_OPENGLES2_INTERFACE_1_0 "PPB_OpenGLES2;1.0"
+#define PPB_OPENGLES2_INTERFACE PPB_OPENGLES2_INTERFACE_1_0
+
+struct PPB_OpenGLES2 {
+  void (*ActiveTexture)(PP_Resource context, GLenum texture);
+  void (*AttachShader)(PP_Resource context, GLuint program, GLuint shader);
+  void (*BindAttribLocation)(
+      PP_Resource context, GLuint program, GLuint index, const char* name);
+  void (*BindBuffer)(PP_Resource context, GLenum target, GLuint buffer);
+  void (*BindFramebuffer)(
+      PP_Resource context, GLenum target, GLuint framebuffer);
+  void (*BindRenderbuffer)(
+      PP_Resource context, GLenum target, GLuint renderbuffer);
+  void (*BindTexture)(PP_Resource context, GLenum target, GLuint texture);
+  void (*BlendColor)(
+      PP_Resource context, GLclampf red, GLclampf green, GLclampf blue,
+      GLclampf alpha);
+  void (*BlendEquation)(PP_Resource context, GLenum mode);
+  void (*BlendEquationSeparate)(
+      PP_Resource context, GLenum modeRGB, GLenum modeAlpha);
+  void (*BlendFunc)(PP_Resource context, GLenum sfactor, GLenum dfactor);
+  void (*BlendFuncSeparate)(
+      PP_Resource context, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha,
+      GLenum dstAlpha);
+  void (*BufferData)(
+      PP_Resource context, GLenum target, GLsizeiptr size, const void* data,
+      GLenum usage);
+  void (*BufferSubData)(
+      PP_Resource context, GLenum target, GLintptr offset, GLsizeiptr size,
+      const void* data);
+  GLenum (*CheckFramebufferStatus)(PP_Resource context, GLenum target);
+  void (*Clear)(PP_Resource context, GLbitfield mask);
+  void (*ClearColor)(
+      PP_Resource context, GLclampf red, GLclampf green, GLclampf blue,
+      GLclampf alpha);
+  void (*ClearDepthf)(PP_Resource context, GLclampf depth);
+  void (*ClearStencil)(PP_Resource context, GLint s);
+  void (*ColorMask)(
+      PP_Resource context, GLboolean red, GLboolean green, GLboolean blue,
+      GLboolean alpha);
+  void (*CompileShader)(PP_Resource context, GLuint shader);
+  void (*CompressedTexImage2D)(
+      PP_Resource context, GLenum target, GLint level, GLenum internalformat,
+      GLsizei width, GLsizei height, GLint border, GLsizei imageSize,
+      const void* data);
+  void (*CompressedTexSubImage2D)(
+      PP_Resource context, GLenum target, GLint level, GLint xoffset,
+      GLint yoffset, GLsizei width, GLsizei height, GLenum format,
+      GLsizei imageSize, const void* data);
+  void (*CopyTexImage2D)(
+      PP_Resource context, GLenum target, GLint level, GLenum internalformat,
+      GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+  void (*CopyTexSubImage2D)(
+      PP_Resource context, GLenum target, GLint level, GLint xoffset,
+      GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+  GLuint (*CreateProgram)(PP_Resource context);
+  GLuint (*CreateShader)(PP_Resource context, GLenum type);
+  void (*CullFace)(PP_Resource context, GLenum mode);
+  void (*DeleteBuffers)(PP_Resource context, GLsizei n, const GLuint* buffers);
+  void (*DeleteFramebuffers)(
+      PP_Resource context, GLsizei n, const GLuint* framebuffers);
+  void (*DeleteProgram)(PP_Resource context, GLuint program);
+  void (*DeleteRenderbuffers)(
+      PP_Resource context, GLsizei n, const GLuint* renderbuffers);
+  void (*DeleteShader)(PP_Resource context, GLuint shader);
+  void (*DeleteTextures)(
+      PP_Resource context, GLsizei n, const GLuint* textures);
+  void (*DepthFunc)(PP_Resource context, GLenum func);
+  void (*DepthMask)(PP_Resource context, GLboolean flag);
+  void (*DepthRangef)(PP_Resource context, GLclampf zNear, GLclampf zFar);
+  void (*DetachShader)(PP_Resource context, GLuint program, GLuint shader);
+  void (*Disable)(PP_Resource context, GLenum cap);
+  void (*DisableVertexAttribArray)(PP_Resource context, GLuint index);
+  void (*DrawArrays)(
+      PP_Resource context, GLenum mode, GLint first, GLsizei count);
+  void (*DrawElements)(
+      PP_Resource context, GLenum mode, GLsizei count, GLenum type,
+      const void* indices);
+  void (*Enable)(PP_Resource context, GLenum cap);
+  void (*EnableVertexAttribArray)(PP_Resource context, GLuint index);
+  void (*Finish)(PP_Resource context);
+  void (*Flush)(PP_Resource context);
+  void (*FramebufferRenderbuffer)(
+      PP_Resource context, GLenum target, GLenum attachment,
+      GLenum renderbuffertarget, GLuint renderbuffer);
+  void (*FramebufferTexture2D)(
+      PP_Resource context, GLenum target, GLenum attachment, GLenum textarget,
+      GLuint texture, GLint level);
+  void (*FrontFace)(PP_Resource context, GLenum mode);
+  void (*GenBuffers)(PP_Resource context, GLsizei n, GLuint* buffers);
+  void (*GenerateMipmap)(PP_Resource context, GLenum target);
+  void (*GenFramebuffers)(
+      PP_Resource context, GLsizei n, GLuint* framebuffers);
+  void (*GenRenderbuffers)(
+      PP_Resource context, GLsizei n, GLuint* renderbuffers);
+  void (*GenTextures)(PP_Resource context, GLsizei n, GLuint* textures);
+  void (*GetActiveAttrib)(
+      PP_Resource context, GLuint program, GLuint index, GLsizei bufsize,
+      GLsizei* length, GLint* size, GLenum* type, char* name);
+  void (*GetActiveUniform)(
+      PP_Resource context, GLuint program, GLuint index, GLsizei bufsize,
+      GLsizei* length, GLint* size, GLenum* type, char* name);
+  void (*GetAttachedShaders)(
+      PP_Resource context, GLuint program, GLsizei maxcount, GLsizei* count,
+      GLuint* shaders);
+  GLint (*GetAttribLocation)(
+      PP_Resource context, GLuint program, const char* name);
+  void (*GetBooleanv)(PP_Resource context, GLenum pname, GLboolean* params);
+  void (*GetBufferParameteriv)(
+      PP_Resource context, GLenum target, GLenum pname, GLint* params);
+  GLenum (*GetError)(PP_Resource context);
+  void (*GetFloatv)(PP_Resource context, GLenum pname, GLfloat* params);
+  void (*GetFramebufferAttachmentParameteriv)(
+      PP_Resource context, GLenum target, GLenum attachment, GLenum pname,
+      GLint* params);
+  void (*GetIntegerv)(PP_Resource context, GLenum pname, GLint* params);
+  void (*GetProgramiv)(
+      PP_Resource context, GLuint program, GLenum pname, GLint* params);
+  void (*GetProgramInfoLog)(
+      PP_Resource context, GLuint program, GLsizei bufsize, GLsizei* length,
+      char* infolog);
+  void (*GetRenderbufferParameteriv)(
+      PP_Resource context, GLenum target, GLenum pname, GLint* params);
+  void (*GetShaderiv)(
+      PP_Resource context, GLuint shader, GLenum pname, GLint* params);
+  void (*GetShaderInfoLog)(
+      PP_Resource context, GLuint shader, GLsizei bufsize, GLsizei* length,
+      char* infolog);
+  void (*GetShaderPrecisionFormat)(
+      PP_Resource context, GLenum shadertype, GLenum precisiontype,
+      GLint* range, GLint* precision);
+  void (*GetShaderSource)(
+      PP_Resource context, GLuint shader, GLsizei bufsize, GLsizei* length,
+      char* source);
+  const GLubyte* (*GetString)(PP_Resource context, GLenum name);
+  void (*GetTexParameterfv)(
+      PP_Resource context, GLenum target, GLenum pname, GLfloat* params);
+  void (*GetTexParameteriv)(
+      PP_Resource context, GLenum target, GLenum pname, GLint* params);
+  void (*GetUniformfv)(
+      PP_Resource context, GLuint program, GLint location, GLfloat* params);
+  void (*GetUniformiv)(
+      PP_Resource context, GLuint program, GLint location, GLint* params);
+  GLint (*GetUniformLocation)(
+      PP_Resource context, GLuint program, const char* name);
+  void (*GetVertexAttribfv)(
+      PP_Resource context, GLuint index, GLenum pname, GLfloat* params);
+  void (*GetVertexAttribiv)(
+      PP_Resource context, GLuint index, GLenum pname, GLint* params);
+  void (*GetVertexAttribPointerv)(
+      PP_Resource context, GLuint index, GLenum pname, void** pointer);
+  void (*Hint)(PP_Resource context, GLenum target, GLenum mode);
+  GLboolean (*IsBuffer)(PP_Resource context, GLuint buffer);
+  GLboolean (*IsEnabled)(PP_Resource context, GLenum cap);
+  GLboolean (*IsFramebuffer)(PP_Resource context, GLuint framebuffer);
+  GLboolean (*IsProgram)(PP_Resource context, GLuint program);
+  GLboolean (*IsRenderbuffer)(PP_Resource context, GLuint renderbuffer);
+  GLboolean (*IsShader)(PP_Resource context, GLuint shader);
+  GLboolean (*IsTexture)(PP_Resource context, GLuint texture);
+  void (*LineWidth)(PP_Resource context, GLfloat width);
+  void (*LinkProgram)(PP_Resource context, GLuint program);
+  void (*PixelStorei)(PP_Resource context, GLenum pname, GLint param);
+  void (*PolygonOffset)(PP_Resource context, GLfloat factor, GLfloat units);
+  void (*ReadPixels)(
+      PP_Resource context, GLint x, GLint y, GLsizei width, GLsizei height,
+      GLenum format, GLenum type, void* pixels);
+  void (*ReleaseShaderCompiler)(PP_Resource context);
+  void (*RenderbufferStorage)(
+      PP_Resource context, GLenum target, GLenum internalformat, GLsizei width,
+      GLsizei height);
+  void (*SampleCoverage)(
+      PP_Resource context, GLclampf value, GLboolean invert);
+  void (*Scissor)(
+      PP_Resource context, GLint x, GLint y, GLsizei width, GLsizei height);
+  void (*ShaderBinary)(
+      PP_Resource context, GLsizei n, const GLuint* shaders,
+      GLenum binaryformat, const void* binary, GLsizei length);
+  void (*ShaderSource)(
+      PP_Resource context, GLuint shader, GLsizei count, const char** str,
+      const GLint* length);
+  void (*StencilFunc)(
+      PP_Resource context, GLenum func, GLint ref, GLuint mask);
+  void (*StencilFuncSeparate)(
+      PP_Resource context, GLenum face, GLenum func, GLint ref, GLuint mask);
+  void (*StencilMask)(PP_Resource context, GLuint mask);
+  void (*StencilMaskSeparate)(PP_Resource context, GLenum face, GLuint mask);
+  void (*StencilOp)(
+      PP_Resource context, GLenum fail, GLenum zfail, GLenum zpass);
+  void (*StencilOpSeparate)(
+      PP_Resource context, GLenum face, GLenum fail, GLenum zfail,
+      GLenum zpass);
+  void (*TexImage2D)(
+      PP_Resource context, GLenum target, GLint level, GLint internalformat,
+      GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type,
+      const void* pixels);
+  void (*TexParameterf)(
+      PP_Resource context, GLenum target, GLenum pname, GLfloat param);
+  void (*TexParameterfv)(
+      PP_Resource context, GLenum target, GLenum pname, const GLfloat* params);
+  void (*TexParameteri)(
+      PP_Resource context, GLenum target, GLenum pname, GLint param);
+  void (*TexParameteriv)(
+      PP_Resource context, GLenum target, GLenum pname, const GLint* params);
+  void (*TexSubImage2D)(
+      PP_Resource context, GLenum target, GLint level, GLint xoffset,
+      GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type,
+      const void* pixels);
+  void (*Uniform1f)(PP_Resource context, GLint location, GLfloat x);
+  void (*Uniform1fv)(
+      PP_Resource context, GLint location, GLsizei count, const GLfloat* v);
+  void (*Uniform1i)(PP_Resource context, GLint location, GLint x);
+  void (*Uniform1iv)(
+      PP_Resource context, GLint location, GLsizei count, const GLint* v);
+  void (*Uniform2f)(PP_Resource context, GLint location, GLfloat x, GLfloat y);
+  void (*Uniform2fv)(
+      PP_Resource context, GLint location, GLsizei count, const GLfloat* v);
+  void (*Uniform2i)(PP_Resource context, GLint location, GLint x, GLint y);
+  void (*Uniform2iv)(
+      PP_Resource context, GLint location, GLsizei count, const GLint* v);
+  void (*Uniform3f)(
+      PP_Resource context, GLint location, GLfloat x, GLfloat y, GLfloat z);
+  void (*Uniform3fv)(
+      PP_Resource context, GLint location, GLsizei count, const GLfloat* v);
+  void (*Uniform3i)(
+      PP_Resource context, GLint location, GLint x, GLint y, GLint z);
+  void (*Uniform3iv)(
+      PP_Resource context, GLint location, GLsizei count, const GLint* v);
+  void (*Uniform4f)(
+      PP_Resource context, GLint location, GLfloat x, GLfloat y, GLfloat z,
+      GLfloat w);
+  void (*Uniform4fv)(
+      PP_Resource context, GLint location, GLsizei count, const GLfloat* v);
+  void (*Uniform4i)(
+      PP_Resource context, GLint location, GLint x, GLint y, GLint z, GLint w);
+  void (*Uniform4iv)(
+      PP_Resource context, GLint location, GLsizei count, const GLint* v);
+  void (*UniformMatrix2fv)(
+      PP_Resource context, GLint location, GLsizei count, GLboolean transpose,
+      const GLfloat* value);
+  void (*UniformMatrix3fv)(
+      PP_Resource context, GLint location, GLsizei count, GLboolean transpose,
+      const GLfloat* value);
+  void (*UniformMatrix4fv)(
+      PP_Resource context, GLint location, GLsizei count, GLboolean transpose,
+      const GLfloat* value);
+  void (*UseProgram)(PP_Resource context, GLuint program);
+  void (*ValidateProgram)(PP_Resource context, GLuint program);
+  void (*VertexAttrib1f)(PP_Resource context, GLuint indx, GLfloat x);
+  void (*VertexAttrib1fv)(
+      PP_Resource context, GLuint indx, const GLfloat* values);
+  void (*VertexAttrib2f)(
+      PP_Resource context, GLuint indx, GLfloat x, GLfloat y);
+  void (*VertexAttrib2fv)(
+      PP_Resource context, GLuint indx, const GLfloat* values);
+  void (*VertexAttrib3f)(
+      PP_Resource context, GLuint indx, GLfloat x, GLfloat y, GLfloat z);
+  void (*VertexAttrib3fv)(
+      PP_Resource context, GLuint indx, const GLfloat* values);
+  void (*VertexAttrib4f)(
+      PP_Resource context, GLuint indx, GLfloat x, GLfloat y, GLfloat z,
+      GLfloat w);
+  void (*VertexAttrib4fv)(
+      PP_Resource context, GLuint indx, const GLfloat* values);
+  void (*VertexAttribPointer)(
+      PP_Resource context, GLuint indx, GLint size, GLenum type,
+      GLboolean normalized, GLsizei stride, const void* ptr);
+  void (*Viewport)(
+      PP_Resource context, GLint x, GLint y, GLsizei width, GLsizei height);
+};
+
+#endif  // PPAPI_C_PPB_OPENGLES2_H_
+
diff --git a/ppapi/examples/gles2/gles2.cc b/ppapi/examples/gles2/gles2.cc
index 04f31f7..dfb3845 100644
--- a/ppapi/examples/gles2/gles2.cc
+++ b/ppapi/examples/gles2/gles2.cc
@@ -13,7 +13,7 @@
 
 #include "ppapi/c/dev/ppb_console_dev.h"
 #include "ppapi/c/pp_errors.h"
-#include "ppapi/c/ppb_opengles.h"
+#include "ppapi/c/ppb_opengles2.h"
 #include "ppapi/cpp/dev/context_3d_dev.h"
 #include "ppapi/cpp/dev/surface_3d_dev.h"
 #include "ppapi/cpp/dev/video_decoder_client_dev.h"
diff --git a/ppapi/lib/gl/gles2/gl2ext_ppapi.h b/ppapi/lib/gl/gles2/gl2ext_ppapi.h
index 7c84397..fcfabd8 100644
--- a/ppapi/lib/gl/gles2/gl2ext_ppapi.h
+++ b/ppapi/lib/gl/gles2/gl2ext_ppapi.h
@@ -11,7 +11,7 @@
 
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/ppb.h"
-#include "ppapi/c/ppb_opengles.h"
+#include "ppapi/c/ppb_opengles2.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/ppapi/lib/gl/gles2/gles2.c b/ppapi/lib/gl/gles2/gles2.c
index 5dc1acc..8dba474 100644
--- a/ppapi/lib/gl/gles2/gles2.c
+++ b/ppapi/lib/gl/gles2/gles2.c
@@ -2,7 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// This file is auto-generated. DO NOT EDIT!
+// This file is auto-generated from
+// gpu/command_buffer/build_gles2_cmd_buffer.py
+// DO NOT EDIT!
 
 #include <GLES2/gl2.h>
 #include "ppapi/lib/gl/gles2/gl2ext_ppapi.h"
diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc
index 87bc815..90c2e0e 100644
--- a/ppapi/proxy/interface_list.cc
+++ b/ppapi/proxy/interface_list.cc
@@ -31,7 +31,7 @@
 #include "ppapi/c/ppb_input_event.h"
 #include "ppapi/c/ppb_instance.h"
 #include "ppapi/c/ppb_messaging.h"
-#include "ppapi/c/ppb_opengles.h"
+#include "ppapi/c/ppb_opengles2.h"
 #include "ppapi/c/ppb_url_loader.h"
 #include "ppapi/c/ppb_url_request_info.h"
 #include "ppapi/c/ppb_url_response_info.h"
diff --git a/ppapi/shared_impl/opengles2_impl.h b/ppapi/shared_impl/opengles2_impl.h
index 261ffd2..4ed6e90 100644
--- a/ppapi/shared_impl/opengles2_impl.h
+++ b/ppapi/shared_impl/opengles2_impl.h
@@ -5,7 +5,7 @@
 #ifndef PPAPI_SHARED_IMPL_OPENGLES2_IMPL_H_
 #define PPAPI_SHARED_IMPL_OPENGLES2_IMPL_H_
 
-#include "ppapi/c/ppb_opengles.h"
+#include "ppapi/c/ppb_opengles2.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 
 namespace ppapi {
diff --git a/ppapi/tests/all_c_includes.h b/ppapi/tests/all_c_includes.h
index 269472d..d5b9d79 100644
--- a/ppapi/tests/all_c_includes.h
+++ b/ppapi/tests/all_c_includes.h
@@ -78,7 +78,7 @@
 #include "ppapi/c/ppb_input_event.h"
 #include "ppapi/c/ppb_instance.h"
 #include "ppapi/c/ppb_messaging.h"
-#include "ppapi/c/ppb_opengles.h"
+#include "ppapi/c/ppb_opengles2.h"
 #include "ppapi/c/ppb_url_loader.h"
 #include "ppapi/c/ppb_url_request_info.h"
 #include "ppapi/c/ppb_url_response_info.h"