Moved the logic of maintaining the current context to gles2 helper library.

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

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

2 files changed, 232 insertions, 173 deletions

diff --git a/ppapi/c/dev/ppb_graphics_3d_dev.h b/ppapi/c/dev/ppb_graphics_3d_dev.h
index dc77571..cb67d46 100644
--- a/ppapi/c/dev/ppb_graphics_3d_dev.h
+++ b/ppapi/c/dev/ppb_graphics_3d_dev.h
@@ -78,14 +78,6 @@ struct PPB_Graphics3D_Dev {
   // Any thread.
   void* (*GetProcAddress)(const char* name);
 
-  // Make a particular context current of the calling thread.  Returns PP_TRUE
-  // on success, PP_FALSE on failure.
-  PP_Bool (*MakeCurent)(PP_Resource context);
-
-  // Returns the calling thread's current context or NULL if no context is
-  // current.
-  PP_Resource (*GetCurrentContext)();
-
   // Snapshots the rendered frame and makes it available for composition with
   // the rest of the page. The alpha channel is used for translucency effects.
   // One means fully opaque. Zero means fully transparent. Any thread.
diff --git a/ppapi/c/dev/ppb_opengles_dev.h b/ppapi/c/dev/ppb_opengles_dev.h
index 250c7a6..76baa89 100644
--- a/ppapi/c/dev/ppb_opengles_dev.h
+++ b/ppapi/c/dev/ppb_opengles_dev.h
@@ -4,20 +4,16 @@
 
 // This file is auto-generated. DO NOT EDIT!
 
-// This interface is used to access common and lite profile OpenGL ES 2.0
-// functions.
+// OpenGL ES interface.
 #ifndef PPAPI_C_DEV_PPB_OPENGLES_DEV_H_
 #define PPAPI_C_DEV_PPB_OPENGLES_DEV_H_
 
-#include "ppapi/GLES2/khrplatform.h"
-
-#define PPB_OPENGLES_DEV_INTERFACE "PPB_OpenGLES(Dev);2.0"
-
+#ifndef __gl2_h_
 typedef unsigned int GLenum;
 typedef void GLvoid;
-typedef khronos_intptr_t GLintptr;
+typedef long int GLintptr;
 typedef int GLsizei;
-typedef khronos_ssize_t GLsizeiptr;
+typedef long int GLsizeiptr;
 typedef int GLint;
 typedef unsigned char GLboolean;
 typedef unsigned int GLuint;
@@ -30,204 +26,275 @@ typedef unsigned char GLubyte;
 typedef int GLfixed;
 typedef unsigned short GLushort;
 typedef int GLclampx;
+#endif  // __gl2_h_
 
-struct PPB_OpenGLES_Dev {
-  void (*ActiveTexture)(GLenum texture);
-  void (*AttachShader)(GLuint program, GLuint shader);
-  void (*BindAttribLocation)(GLuint program, GLuint index, const char* name);
-  void (*BindBuffer)(GLenum target, GLuint buffer);
-  void (*BindFramebuffer)(GLenum target, GLuint framebuffer);
-  void (*BindRenderbuffer)(GLenum target, GLuint renderbuffer);
-  void (*BindTexture)(GLenum target, GLuint texture);
+#define PPB_OPENGLES2_DEV_INTERFACE "PPB_OpenGLES(Dev);2.0"
+
+struct PPB_OpenGLES2_Dev {
+  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)(
-      GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-  void (*BlendEquation)(GLenum mode);
-  void (*BlendEquationSeparate)(GLenum modeRGB, GLenum modeAlpha);
-  void (*BlendFunc)(GLenum sfactor, GLenum dfactor);
+      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)(
-      GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+      PP_Resource context, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha,
+      GLenum dstAlpha);
   void (*BufferData)(
-      GLenum target, GLsizeiptr size, const void* data, GLenum usage);
+      PP_Resource context, GLenum target, GLsizeiptr size, const void* data,
+      GLenum usage);
   void (*BufferSubData)(
-      GLenum target, GLintptr offset, GLsizeiptr size, const void* data);
-  GLenum (*CheckFramebufferStatus)(GLenum target);
-  void (*Clear)(GLbitfield mask);
+      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)(
-      GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-  void (*ClearDepthf)(GLclampf depth);
-  void (*ClearStencil)(GLint s);
+      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)(
-      GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-  void (*CompileShader)(GLuint shader);
+      PP_Resource context, GLboolean red, GLboolean green, GLboolean blue,
+      GLboolean alpha);
+  void (*CompileShader)(PP_Resource context, GLuint shader);
   void (*CompressedTexImage2D)(
-      GLenum target, GLint level, GLenum internalformat, GLsizei width,
-      GLsizei height, GLint border, GLsizei imageSize, const void* data);
+      PP_Resource context, GLenum target, GLint level, GLenum internalformat,
+      GLsizei width, GLsizei height, GLint border, GLsizei imageSize,
+      const void* data);
   void (*CompressedTexSubImage2D)(
-      GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
-      GLsizei height, GLenum format, GLsizei imageSize, const void* data);
+      PP_Resource context, GLenum target, GLint level, GLint xoffset,
+      GLint yoffset, GLsizei width, GLsizei height, GLenum format,
+      GLsizei imageSize, const void* data);
   void (*CopyTexImage2D)(
-      GLenum target, GLint level, GLenum internalformat, GLint x, GLint y,
-      GLsizei width, GLsizei height, GLint border);
+      PP_Resource context, GLenum target, GLint level, GLenum internalformat,
+      GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
   void (*CopyTexSubImage2D)(
-      GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x,
-      GLint y, GLsizei width, GLsizei height);
-  GLuint (*CreateProgram)();
-  GLuint (*CreateShader)(GLenum type);
-  void (*CullFace)(GLenum mode);
-  void (*DeleteBuffers)(GLsizei n, const GLuint* buffers);
-  void (*DeleteFramebuffers)(GLsizei n, const GLuint* framebuffers);
-  void (*DeleteProgram)(GLuint program);
-  void (*DeleteRenderbuffers)(GLsizei n, const GLuint* renderbuffers);
-  void (*DeleteShader)(GLuint shader);
-  void (*DeleteTextures)(GLsizei n, const GLuint* textures);
-  void (*DepthFunc)(GLenum func);
-  void (*DepthMask)(GLboolean flag);
-  void (*DepthRangef)(GLclampf zNear, GLclampf zFar);
-  void (*DetachShader)(GLuint program, GLuint shader);
-  void (*Disable)(GLenum cap);
-  void (*DisableVertexAttribArray)(GLuint index);
-  void (*DrawArrays)(GLenum mode, GLint first, GLsizei count);
+      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)(
-      GLenum mode, GLsizei count, GLenum type, const void* indices);
-  void (*Enable)(GLenum cap);
-  void (*EnableVertexAttribArray)(GLuint index);
-  void (*Finish)();
-  void (*Flush)();
+      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)(
-      GLenum target, GLenum attachment, GLenum renderbuffertarget,
-      GLuint renderbuffer);
+      PP_Resource context, GLenum target, GLenum attachment,
+      GLenum renderbuffertarget, GLuint renderbuffer);
   void (*FramebufferTexture2D)(
-      GLenum target, GLenum attachment, GLenum textarget, GLuint texture,
-      GLint level);
-  void (*FrontFace)(GLenum mode);
-  void (*GenBuffers)(GLsizei n, GLuint* buffers);
-  void (*GenerateMipmap)(GLenum target);
-  void (*GenFramebuffers)(GLsizei n, GLuint* framebuffers);
-  void (*GenRenderbuffers)(GLsizei n, GLuint* renderbuffers);
-  void (*GenTextures)(GLsizei n, GLuint* textures);
+      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)(
-      GLuint program, GLuint index, GLsizei bufsize, GLsizei* length,
-      GLint* size, GLenum* type, char* name);
+      PP_Resource context, GLuint program, GLuint index, GLsizei bufsize,
+      GLsizei* length, GLint* size, GLenum* type, char* name);
   void (*GetActiveUniform)(
-      GLuint program, GLuint index, GLsizei bufsize, GLsizei* length,
-      GLint* size, GLenum* type, char* name);
+      PP_Resource context, GLuint program, GLuint index, GLsizei bufsize,
+      GLsizei* length, GLint* size, GLenum* type, char* name);
   void (*GetAttachedShaders)(
-      GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders);
-  GLint (*GetAttribLocation)(GLuint program, const char* name);
-  void (*GetBooleanv)(GLenum pname, GLboolean* params);
-  void (*GetBufferParameteriv)(GLenum target, GLenum pname, GLint* params);
-  GLenum (*GetError)();
-  void (*GetFloatv)(GLenum pname, GLfloat* params);
+      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)(
-      GLenum target, GLenum attachment, GLenum pname, GLint* params);
-  void (*GetIntegerv)(GLenum pname, GLint* params);
-  void (*GetProgramiv)(GLuint program, GLenum pname, GLint* params);
+      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)(
-      GLuint program, GLsizei bufsize, GLsizei* length, char* infolog);
+      PP_Resource context, GLuint program, GLsizei bufsize, GLsizei* length,
+      char* infolog);
   void (*GetRenderbufferParameteriv)(
-      GLenum target, GLenum pname, GLint* params);
-  void (*GetShaderiv)(GLuint shader, GLenum pname, GLint* params);
+      PP_Resource context, GLenum target, GLenum pname, GLint* params);
+  void (*GetShaderiv)(
+      PP_Resource context, GLuint shader, GLenum pname, GLint* params);
   void (*GetShaderInfoLog)(
-      GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog);
+      PP_Resource context, GLuint shader, GLsizei bufsize, GLsizei* length,
+      char* infolog);
   void (*GetShaderPrecisionFormat)(
-      GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision);
+      PP_Resource context, GLenum shadertype, GLenum precisiontype,
+      GLint* range, GLint* precision);
   void (*GetShaderSource)(
-      GLuint shader, GLsizei bufsize, GLsizei* length, char* source);
-  const GLubyte* (*GetString)(GLenum name);
-  void (*GetTexParameterfv)(GLenum target, GLenum pname, GLfloat* params);
-  void (*GetTexParameteriv)(GLenum target, GLenum pname, GLint* params);
-  void (*GetUniformfv)(GLuint program, GLint location, GLfloat* params);
-  void (*GetUniformiv)(GLuint program, GLint location, GLint* params);
-  GLint (*GetUniformLocation)(GLuint program, const char* name);
-  void (*GetVertexAttribfv)(GLuint index, GLenum pname, GLfloat* params);
-  void (*GetVertexAttribiv)(GLuint index, GLenum pname, GLint* params);
-  void (*GetVertexAttribPointerv)(GLuint index, GLenum pname, void** pointer);
-  void (*Hint)(GLenum target, GLenum mode);
-  GLboolean (*IsBuffer)(GLuint buffer);
-  GLboolean (*IsEnabled)(GLenum cap);
-  GLboolean (*IsFramebuffer)(GLuint framebuffer);
-  GLboolean (*IsProgram)(GLuint program);
-  GLboolean (*IsRenderbuffer)(GLuint renderbuffer);
-  GLboolean (*IsShader)(GLuint shader);
-  GLboolean (*IsTexture)(GLuint texture);
-  void (*LineWidth)(GLfloat width);
-  void (*LinkProgram)(GLuint program);
-  void (*PixelStorei)(GLenum pname, GLint param);
-  void (*PolygonOffset)(GLfloat factor, GLfloat units);
+      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)(
-      GLint x, GLint y, GLsizei width, GLsizei height, GLenum format,
-      GLenum type, void* pixels);
-  void (*ReleaseShaderCompiler)();
+      PP_Resource context, GLint x, GLint y, GLsizei width, GLsizei height,
+      GLenum format, GLenum type, void* pixels);
+  void (*ReleaseShaderCompiler)(PP_Resource context);
   void (*RenderbufferStorage)(
-      GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-  void (*SampleCoverage)(GLclampf value, GLboolean invert);
-  void (*Scissor)(GLint x, GLint y, GLsizei width, GLsizei height);
+      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)(
-      GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary,
-      GLsizei length);
+      PP_Resource context, GLsizei n, const GLuint* shaders,
+      GLenum binaryformat, const void* binary, GLsizei length);
   void (*ShaderSource)(
-      GLuint shader, GLsizei count, const char** str, const GLint* length);
-  void (*StencilFunc)(GLenum func, GLint ref, GLuint mask);
+      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)(
-      GLenum face, GLenum func, GLint ref, GLuint mask);
-  void (*StencilMask)(GLuint mask);
-  void (*StencilMaskSeparate)(GLenum face, GLuint mask);
-  void (*StencilOp)(GLenum fail, GLenum zfail, GLenum zpass);
+      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)(
-      GLenum face, GLenum fail, GLenum zfail, GLenum zpass);
+      PP_Resource context, GLenum face, GLenum fail, GLenum zfail,
+      GLenum zpass);
   void (*TexImage2D)(
-      GLenum target, GLint level, GLint internalformat, GLsizei width,
-      GLsizei height, GLint border, GLenum format, GLenum type,
+      PP_Resource context, GLenum target, GLint level, GLint internalformat,
+      GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type,
       const void* pixels);
-  void (*TexParameterf)(GLenum target, GLenum pname, GLfloat param);
-  void (*TexParameterfv)(GLenum target, GLenum pname, const GLfloat* params);
-  void (*TexParameteri)(GLenum target, GLenum pname, GLint param);
-  void (*TexParameteriv)(GLenum target, GLenum pname, const GLint* params);
+  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)(
-      GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
-      GLsizei height, GLenum format, GLenum type, const void* pixels);
-  void (*Uniform1f)(GLint location, GLfloat x);
-  void (*Uniform1fv)(GLint location, GLsizei count, const GLfloat* v);
-  void (*Uniform1i)(GLint location, GLint x);
-  void (*Uniform1iv)(GLint location, GLsizei count, const GLint* v);
-  void (*Uniform2f)(GLint location, GLfloat x, GLfloat y);
-  void (*Uniform2fv)(GLint location, GLsizei count, const GLfloat* v);
-  void (*Uniform2i)(GLint location, GLint x, GLint y);
-  void (*Uniform2iv)(GLint location, GLsizei count, const GLint* v);
-  void (*Uniform3f)(GLint location, GLfloat x, GLfloat y, GLfloat z);
-  void (*Uniform3fv)(GLint location, GLsizei count, const GLfloat* v);
-  void (*Uniform3i)(GLint location, GLint x, GLint y, GLint z);
-  void (*Uniform3iv)(GLint location, GLsizei count, const GLint* v);
+      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)(
-      GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-  void (*Uniform4fv)(GLint location, GLsizei count, const GLfloat* v);
-  void (*Uniform4i)(GLint location, GLint x, GLint y, GLint z, GLint w);
-  void (*Uniform4iv)(GLint location, GLsizei count, const GLint* v);
+      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)(
-      GLint location, GLsizei count, GLboolean transpose,
+      PP_Resource context, GLint location, GLsizei count, GLboolean transpose,
       const GLfloat* value);
   void (*UniformMatrix3fv)(
-      GLint location, GLsizei count, GLboolean transpose,
+      PP_Resource context, GLint location, GLsizei count, GLboolean transpose,
       const GLfloat* value);
   void (*UniformMatrix4fv)(
-      GLint location, GLsizei count, GLboolean transpose,
+      PP_Resource context, GLint location, GLsizei count, GLboolean transpose,
       const GLfloat* value);
-  void (*UseProgram)(GLuint program);
-  void (*ValidateProgram)(GLuint program);
-  void (*VertexAttrib1f)(GLuint indx, GLfloat x);
-  void (*VertexAttrib1fv)(GLuint indx, const GLfloat* values);
-  void (*VertexAttrib2f)(GLuint indx, GLfloat x, GLfloat y);
-  void (*VertexAttrib2fv)(GLuint indx, const GLfloat* values);
-  void (*VertexAttrib3f)(GLuint indx, GLfloat x, GLfloat y, GLfloat z);
-  void (*VertexAttrib3fv)(GLuint indx, const GLfloat* values);
+  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)(
-      GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-  void (*VertexAttrib4fv)(GLuint indx, const GLfloat* values);
+      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)(
-      GLuint indx, GLint size, GLenum type, GLboolean normalized,
-      GLsizei stride, const void* ptr);
-  void (*Viewport)(GLint x, GLint y, GLsizei width, GLsizei height);
-  void (*SwapBuffers)();
+      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_DEV_PPB_OPENGLES_DEV_H_