Index: ppapi/shared_impl/ppb_opengles2_shared.cc |
diff --git a/ppapi/shared_impl/ppb_opengles2_shared.cc b/ppapi/shared_impl/ppb_opengles2_shared.cc |
index 00cb2ed2f4d57f9df1a19c0f3732794d8401cc61..ab040d5551e4a3763e73bd0f114f6063fb9917e4 100644 |
--- a/ppapi/shared_impl/ppb_opengles2_shared.cc |
+++ b/ppapi/shared_impl/ppb_opengles2_shared.cc |
@@ -1576,83 +1576,155 @@ void DrawBuffersEXT(PP_Resource context_id, GLsizei count, const GLenum* bufs) { |
} // namespace |
const PPB_OpenGLES2* PPB_OpenGLES2_Shared::GetInterface() { |
static const struct PPB_OpenGLES2 ppb_opengles2 = { |
- &ActiveTexture, &AttachShader, |
- &BindAttribLocation, &BindBuffer, |
- &BindFramebuffer, &BindRenderbuffer, |
- &BindTexture, &BlendColor, |
- &BlendEquation, &BlendEquationSeparate, |
- &BlendFunc, &BlendFuncSeparate, |
- &BufferData, &BufferSubData, |
- &CheckFramebufferStatus, &Clear, |
- &ClearColor, &ClearDepthf, |
- &ClearStencil, &ColorMask, |
- &CompileShader, &CompressedTexImage2D, |
- &CompressedTexSubImage2D, &CopyTexImage2D, |
- &CopyTexSubImage2D, &CreateProgram, |
- &CreateShader, &CullFace, |
- &DeleteBuffers, &DeleteFramebuffers, |
- &DeleteProgram, &DeleteRenderbuffers, |
- &DeleteShader, &DeleteTextures, |
- &DepthFunc, &DepthMask, |
- &DepthRangef, &DetachShader, |
- &Disable, &DisableVertexAttribArray, |
- &DrawArrays, &DrawElements, |
- &Enable, &EnableVertexAttribArray, |
- &Finish, &Flush, |
- &FramebufferRenderbuffer, &FramebufferTexture2D, |
- &FrontFace, &GenBuffers, |
- &GenerateMipmap, &GenFramebuffers, |
- &GenRenderbuffers, &GenTextures, |
- &GetActiveAttrib, &GetActiveUniform, |
- &GetAttachedShaders, &GetAttribLocation, |
- &GetBooleanv, &GetBufferParameteriv, |
- &GetError, &GetFloatv, |
- &GetFramebufferAttachmentParameteriv, &GetIntegerv, |
- &GetProgramiv, &GetProgramInfoLog, |
- &GetRenderbufferParameteriv, &GetShaderiv, |
- &GetShaderInfoLog, &GetShaderPrecisionFormat, |
- &GetShaderSource, &GetString, |
- &GetTexParameterfv, &GetTexParameteriv, |
- &GetUniformfv, &GetUniformiv, |
- &GetUniformLocation, &GetVertexAttribfv, |
- &GetVertexAttribiv, &GetVertexAttribPointerv, |
- &Hint, &IsBuffer, |
- &IsEnabled, &IsFramebuffer, |
- &IsProgram, &IsRenderbuffer, |
- &IsShader, &IsTexture, |
- &LineWidth, &LinkProgram, |
- &PixelStorei, &PolygonOffset, |
- &ReadPixels, &ReleaseShaderCompiler, |
- &RenderbufferStorage, &SampleCoverage, |
- &Scissor, &ShaderBinary, |
- &ShaderSource, &StencilFunc, |
- &StencilFuncSeparate, &StencilMask, |
- &StencilMaskSeparate, &StencilOp, |
- &StencilOpSeparate, &TexImage2D, |
- &TexParameterf, &TexParameterfv, |
- &TexParameteri, &TexParameteriv, |
- &TexSubImage2D, &Uniform1f, |
- &Uniform1fv, &Uniform1i, |
- &Uniform1iv, &Uniform2f, |
- &Uniform2fv, &Uniform2i, |
- &Uniform2iv, &Uniform3f, |
- &Uniform3fv, &Uniform3i, |
- &Uniform3iv, &Uniform4f, |
- &Uniform4fv, &Uniform4i, |
- &Uniform4iv, &UniformMatrix2fv, |
- &UniformMatrix3fv, &UniformMatrix4fv, |
- &UseProgram, &ValidateProgram, |
- &VertexAttrib1f, &VertexAttrib1fv, |
- &VertexAttrib2f, &VertexAttrib2fv, |
- &VertexAttrib3f, &VertexAttrib3fv, |
- &VertexAttrib4f, &VertexAttrib4fv, |
- &VertexAttribPointer, &Viewport}; |
+ &ActiveTexture, |
+ &AttachShader, |
+ &BindAttribLocation, |
+ &BindBuffer, |
+ &BindFramebuffer, |
+ &BindRenderbuffer, |
+ &BindTexture, |
+ &BlendColor, |
+ &BlendEquation, |
+ &BlendEquationSeparate, |
+ &BlendFunc, |
+ &BlendFuncSeparate, |
+ &BufferData, |
+ &BufferSubData, |
+ &CheckFramebufferStatus, |
+ &Clear, |
+ &ClearColor, |
+ &ClearDepthf, |
+ &ClearStencil, |
+ &ColorMask, |
+ &CompileShader, |
+ &CompressedTexImage2D, |
+ &CompressedTexSubImage2D, |
+ &CopyTexImage2D, |
+ &CopyTexSubImage2D, |
+ &CreateProgram, |
+ &CreateShader, |
+ &CullFace, |
+ &DeleteBuffers, |
+ &DeleteFramebuffers, |
+ &DeleteProgram, |
+ &DeleteRenderbuffers, |
+ &DeleteShader, |
+ &DeleteTextures, |
+ &DepthFunc, |
+ &DepthMask, |
+ &DepthRangef, |
+ &DetachShader, |
+ &Disable, |
+ &DisableVertexAttribArray, |
+ &DrawArrays, |
+ &DrawElements, |
+ &Enable, |
+ &EnableVertexAttribArray, |
+ &Finish, |
+ &Flush, |
+ &FramebufferRenderbuffer, |
+ &FramebufferTexture2D, |
+ &FrontFace, |
+ &GenBuffers, |
+ &GenerateMipmap, |
+ &GenFramebuffers, |
+ &GenRenderbuffers, |
+ &GenTextures, |
+ &GetActiveAttrib, |
+ &GetActiveUniform, |
+ &GetAttachedShaders, |
+ &GetAttribLocation, |
+ &GetBooleanv, |
+ &GetBufferParameteriv, |
+ &GetError, |
+ &GetFloatv, |
+ &GetFramebufferAttachmentParameteriv, |
+ &GetIntegerv, |
+ &GetProgramiv, |
+ &GetProgramInfoLog, |
+ &GetRenderbufferParameteriv, |
+ &GetShaderiv, |
+ &GetShaderInfoLog, |
+ &GetShaderPrecisionFormat, |
+ &GetShaderSource, |
+ &GetString, |
+ &GetTexParameterfv, |
+ &GetTexParameteriv, |
+ &GetUniformfv, |
+ &GetUniformiv, |
+ &GetUniformLocation, |
+ &GetVertexAttribfv, |
+ &GetVertexAttribiv, |
+ &GetVertexAttribPointerv, |
+ &Hint, |
+ &IsBuffer, |
+ &IsEnabled, |
+ &IsFramebuffer, |
+ &IsProgram, |
+ &IsRenderbuffer, |
+ &IsShader, |
+ &IsTexture, |
+ &LineWidth, |
+ &LinkProgram, |
+ &PixelStorei, |
+ &PolygonOffset, |
+ &ReadPixels, |
+ &ReleaseShaderCompiler, |
+ &RenderbufferStorage, |
+ &SampleCoverage, |
+ &Scissor, |
+ &ShaderBinary, |
+ &ShaderSource, |
+ &StencilFunc, |
+ &StencilFuncSeparate, |
+ &StencilMask, |
+ &StencilMaskSeparate, |
+ &StencilOp, |
+ &StencilOpSeparate, |
+ &TexImage2D, |
+ &TexParameterf, |
+ &TexParameterfv, |
+ &TexParameteri, |
+ &TexParameteriv, |
+ &TexSubImage2D, |
+ &Uniform1f, |
+ &Uniform1fv, |
+ &Uniform1i, |
+ &Uniform1iv, |
+ &Uniform2f, |
+ &Uniform2fv, |
+ &Uniform2i, |
+ &Uniform2iv, |
+ &Uniform3f, |
+ &Uniform3fv, |
+ &Uniform3i, |
+ &Uniform3iv, |
+ &Uniform4f, |
+ &Uniform4fv, |
+ &Uniform4i, |
+ &Uniform4iv, |
+ &UniformMatrix2fv, |
+ &UniformMatrix3fv, |
+ &UniformMatrix4fv, |
+ &UseProgram, |
+ &ValidateProgram, |
+ &VertexAttrib1f, |
+ &VertexAttrib1fv, |
+ &VertexAttrib2f, |
+ &VertexAttrib2fv, |
+ &VertexAttrib3f, |
+ &VertexAttrib3fv, |
+ &VertexAttrib4f, |
+ &VertexAttrib4fv, |
+ &VertexAttribPointer, |
+ &Viewport}; |
return &ppb_opengles2; |
} |
const PPB_OpenGLES2InstancedArrays* |
PPB_OpenGLES2_Shared::GetInstancedArraysInterface() { |
static const struct PPB_OpenGLES2InstancedArrays ppb_opengles2 = { |
- &DrawArraysInstancedANGLE, &DrawElementsInstancedANGLE, |
+ &DrawArraysInstancedANGLE, |
+ &DrawElementsInstancedANGLE, |
&VertexAttribDivisorANGLE}; |
return &ppb_opengles2; |
} |
@@ -1677,14 +1749,21 @@ PPB_OpenGLES2_Shared::GetChromiumEnableFeatureInterface() { |
const PPB_OpenGLES2ChromiumMapSub* |
PPB_OpenGLES2_Shared::GetChromiumMapSubInterface() { |
static const struct PPB_OpenGLES2ChromiumMapSub ppb_opengles2 = { |
- &MapBufferSubDataCHROMIUM, &UnmapBufferSubDataCHROMIUM, |
- &MapTexSubImage2DCHROMIUM, &UnmapTexSubImage2DCHROMIUM}; |
+ &MapBufferSubDataCHROMIUM, |
+ &UnmapBufferSubDataCHROMIUM, |
+ &MapTexSubImage2DCHROMIUM, |
+ &UnmapTexSubImage2DCHROMIUM}; |
return &ppb_opengles2; |
} |
const PPB_OpenGLES2Query* PPB_OpenGLES2_Shared::GetQueryInterface() { |
static const struct PPB_OpenGLES2Query ppb_opengles2 = { |
- &GenQueriesEXT, &DeleteQueriesEXT, &IsQueryEXT, &BeginQueryEXT, |
- &EndQueryEXT, &GetQueryivEXT, &GetQueryObjectuivEXT}; |
+ &GenQueriesEXT, |
+ &DeleteQueriesEXT, |
+ &IsQueryEXT, |
+ &BeginQueryEXT, |
+ &EndQueryEXT, |
+ &GetQueryivEXT, |
+ &GetQueryObjectuivEXT}; |
return &ppb_opengles2; |
} |
const PPB_OpenGLES2DrawBuffers_Dev* |