Add ES3 APIs to gl bindings: PART II.

This is the second half of the new APIs.

BUG=429052
TEST=bots
R=kbr@chromium.org

Review URL: https://codereview.chromium.org/735173003

Cr-Commit-Position: refs/heads/master@{#304950}

1 files changed, 172 insertions, 9 deletions

diff --git a/ui/gl/generate_bindings.py b/ui/gl/generate_bindings.py
index f9afa2e..6fff4cb 100755
--- a/ui/gl/generate_bindings.py
+++ b/ui/gl/generate_bindings.py
@@ -39,18 +39,32 @@ GL_FUNCTIONS = [
   'names': ['glAttachShader'],
   'arguments': 'GLuint program, GLuint shader', },
 { 'return_type': 'void',
-  'names': ['glBeginQuery'],
+  'versions': [{ 'name': 'glBeginQuery',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],
   'arguments': 'GLenum target, GLuint id', },
 { 'return_type': 'void',
   'names': ['glBeginQueryARB', 'glBeginQueryEXT'],
   'arguments': 'GLenum target, GLuint id', },
 { 'return_type': 'void',
+  'versions': [{ 'name': 'glBeginTransformFeedback',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],
+  'arguments': 'GLenum primitiveMode', },
+{ 'return_type': 'void',
   'names': ['glBindAttribLocation'],
   'arguments': 'GLuint program, GLuint index, const char* name', },
 { 'return_type': 'void',
   'names': ['glBindBuffer'],
   'arguments': 'GLenum target, GLuint buffer', },
 { 'return_type': 'void',
+  'versions': [{ 'name': 'glBindBufferBase',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],
+  'arguments': 'GLenum target, GLuint index, GLuint buffer', },
+{ 'return_type': 'void',
+  'versions': [{ 'name': 'glBindBufferRange',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],
+  'arguments': 'GLenum target, GLuint index, GLuint buffer, GLintptr offset, '
+               'GLsizeiptr size', },
+{ 'return_type': 'void',
   'names': ['glBindFragDataLocation'],
   'arguments': 'GLuint program, GLuint colorNumber, const char* name', },
 { 'return_type': 'void',
@@ -64,9 +78,17 @@ GL_FUNCTIONS = [
   'names': ['glBindRenderbufferEXT', 'glBindRenderbuffer'],
   'arguments': 'GLenum target, GLuint renderbuffer', },
 { 'return_type': 'void',
+  'versions': [{ 'name': 'glBindSampler',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],  # GL 3.2 or higher.
+  'arguments': 'GLuint unit, GLuint sampler', },
+{ 'return_type': 'void',
   'names': ['glBindTexture'],
   'arguments': 'GLenum target, GLuint texture', },
 { 'return_type': 'void',
+  'versions': [{ 'name': 'glBindTransformFeedback',
+                 'gl_versions': ['gl4', 'es3'] }],
+  'arguments': 'GLenum target, GLuint id', },
+{ 'return_type': 'void',
   'known_as': 'glBindVertexArrayOES',
   'versions': [{ 'name': 'glBindVertexArray',
                  'gl_versions': ['gl3', 'gl4', 'es3'] },
@@ -133,6 +155,23 @@ GL_FUNCTIONS = [
   'names': ['glClear'],
   'arguments': 'GLbitfield mask', },
 { 'return_type': 'void',
+  'versions': [{ 'name': 'glClearBufferfi',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],
+  'arguments': 'GLenum buffer, GLint drawbuffer, const GLfloat depth, '
+               'GLint stencil', },
+{ 'return_type': 'void',
+  'versions': [{ 'name': 'glClearBufferfv',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],
+  'arguments': 'GLenum buffer, GLint drawbuffer, const GLfloat* value', },
+{ 'return_type': 'void',
+  'versions': [{ 'name': 'glClearBufferiv',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],
+  'arguments': 'GLenum buffer, GLint drawbuffer, const GLint* value', },
+{ 'return_type': 'void',
+  'versions': [{ 'name': 'glClearBufferuiv',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],
+  'arguments': 'GLenum buffer, GLint drawbuffer, const GLuint* value', },
+{ 'return_type': 'void',
   'names': ['glClearColor'],
   'arguments': 'GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha', },
 { 'return_type': 'void',
@@ -229,7 +268,8 @@ GL_FUNCTIONS = [
   'names': ['glDeleteProgram'],
   'arguments': 'GLuint program', },
 { 'return_type': 'void',
-  'names': ['glDeleteQueries'],
+  'versions': [{ 'name': 'glDeleteQueries',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],
   'arguments': 'GLsizei n, const GLuint* ids', },
 { 'return_type': 'void',
   'names': ['glDeleteQueriesARB', 'glDeleteQueriesEXT'],
@@ -238,6 +278,10 @@ GL_FUNCTIONS = [
   'names': ['glDeleteRenderbuffersEXT', 'glDeleteRenderbuffers'],
   'arguments': 'GLsizei n, const GLuint* renderbuffers', },
 { 'return_type': 'void',
+  'versions': [{ 'name': 'glDeleteSamplers',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],  # GL 3.2 or higher.
+  'arguments': 'GLsizei n, const GLuint* samplers', },
+{ 'return_type': 'void',
   'names': ['glDeleteShader'],
   'arguments': 'GLuint shader', },
 { 'return_type': 'void',
@@ -247,6 +291,10 @@ GL_FUNCTIONS = [
   'names': ['glDeleteTextures'],
   'arguments': 'GLsizei n, const GLuint* textures', },
 { 'return_type': 'void',
+  'versions': [{ 'name': 'glDeleteTransformFeedbacks',
+                 'gl_versions': ['gl4', 'es3'] }],
+  'arguments': 'GLsizei n, const GLuint* ids', },
+{ 'return_type': 'void',
   'known_as': 'glDeleteVertexArraysOES',
   'versions': [{ 'name': 'glDeleteVertexArrays',
                  'gl_versions': ['gl3', 'gl4', 'es3'] },
@@ -312,6 +360,11 @@ GL_FUNCTIONS = [
       'GLenum mode, GLsizei count, GLenum type, const void* indices, '
       'GLsizei primcount', },
 { 'return_type': 'void',
+  'versions': [{ 'name': 'glDrawRangeElements',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],
+  'arguments': 'GLenum mode, GLuint start, GLuint end, GLsizei count, '
+               'GLenum type, const void* indices', },
+{ 'return_type': 'void',
   'names': ['glEGLImageTargetRenderbufferStorageOES'],
   'arguments': 'GLenum target, GLeglImageOES image', },
 { 'return_type': 'void',
@@ -324,11 +377,16 @@ GL_FUNCTIONS = [
   'names': ['glEnableVertexAttribArray'],
   'arguments': 'GLuint index', },
 { 'return_type': 'void',
-  'names': ['glEndQuery'],
+  'versions': [{ 'name': 'glEndQuery',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],
   'arguments': 'GLenum target', },
 { 'return_type': 'void',
   'names': ['glEndQueryARB', 'glEndQueryEXT'],
   'arguments': 'GLenum target', },
+{ 'return_type': 'void',
+  'versions': [{ 'name': 'glEndTransformFeedback',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],
+  'arguments': 'void', },
 { 'return_type': 'GLsync',
   'names': ['glFenceSync'],
   'arguments': 'GLenum condition, GLbitfield flags', },
@@ -395,7 +453,8 @@ GL_FUNCTIONS = [
   'names': ['glGenFramebuffersEXT', 'glGenFramebuffers'],
   'arguments': 'GLsizei n, GLuint* framebuffers', },
 { 'return_type': 'void',
-  'names': ['glGenQueries'],
+  'versions': [{ 'name': 'glGenQueries',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],
   'arguments': 'GLsizei n, GLuint* ids', },
 { 'return_type': 'void',
   'names': ['glGenQueriesARB', 'glGenQueriesEXT'],
@@ -404,9 +463,17 @@ GL_FUNCTIONS = [
   'names': ['glGenRenderbuffersEXT', 'glGenRenderbuffers'],
   'arguments': 'GLsizei n, GLuint* renderbuffers', },
 { 'return_type': 'void',
+  'versions': [{ 'name': 'glGenSamplers',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],  # GL 3.2 or higher.
+  'arguments': 'GLsizei n, GLuint* samplers', },
+{ 'return_type': 'void',
   'names': ['glGenTextures'],
   'arguments': 'GLsizei n, GLuint* textures', },
 { 'return_type': 'void',
+  'versions': [{ 'name': 'glGenTransformFeedbacks',
+                 'gl_versions': ['gl4', 'es3'] }],
+  'arguments': 'GLsizei n, GLuint* ids', },
+{ 'return_type': 'void',
   'known_as': 'glGenVertexArraysOES',
   'versions': [{ 'name': 'glGenVertexArrays',
                  'gl_versions': ['gl3', 'gl4', 'es3'] },
@@ -427,6 +494,21 @@ GL_FUNCTIONS = [
       'GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, '
       'GLint* size, GLenum* type, char* name', },
 { 'return_type': 'void',
+  'versions': [{ 'name': 'glGetActiveUniformBlockiv',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],  # GL 3.1 or higher.
+  'arguments': 'GLuint program, GLuint uniformBlockIndex, GLenum pname, '
+               'GLint* params', },
+{ 'return_type': 'void',
+  'versions': [{ 'name': 'glGetActiveUniformBlockName',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],  # GL 3.1 or higher.
+  'arguments': 'GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, '
+               'GLsizei* length, char* uniformBlockName', },
+{ 'return_type': 'void',
+  'versions': [{ 'name': 'glGetActiveUniformsiv',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],  # GL 3.1 or higher.
+  'arguments': 'GLuint program, GLsizei uniformCount, '
+               'const GLuint* uniformIndices, GLenum pname, GLint* params', },
+{ 'return_type': 'void',
   'names': ['glGetAttachedShaders'],
   'arguments':
       'GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders', },
@@ -467,9 +549,17 @@ GL_FUNCTIONS = [
             'glGetGraphicsResetStatus'],
   'arguments': 'void', },
 { 'return_type': 'void',
+  'versions': [{ 'name': 'glGetInteger64i_v',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],  # GL 3.2 or higher.
+  'arguments': 'GLenum target, GLuint index, GLint64* data', },
+{ 'return_type': 'void',
   'names': ['glGetInteger64v'],
   'arguments': 'GLenum pname, GLint64* params', },
 { 'return_type': 'void',
+  'versions': [{ 'name': 'glGetIntegeri_v',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],
+  'arguments': 'GLenum target, GLuint index, GLint* data', },
+{ 'return_type': 'void',
   'names': ['glGetIntegerv'],
   'arguments': 'GLenum pname, GLint* params', },
 { 'return_type': 'void',
@@ -493,7 +583,8 @@ GL_FUNCTIONS = [
   'names': ['glGetProgramiv'],
   'arguments': 'GLuint program, GLenum pname, GLint* params', },
 { 'return_type': 'void',
-  'names': ['glGetQueryiv'],
+  'versions': [{ 'name': 'glGetQueryiv',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],
   'arguments': 'GLenum target, GLenum pname, GLint* params', },
 { 'return_type': 'void',
   'names': ['glGetQueryivARB', 'glGetQueryivEXT'],
@@ -502,14 +593,18 @@ GL_FUNCTIONS = [
   'names': ['glGetQueryObjecti64v'],
   'arguments': 'GLuint id, GLenum pname, GLint64* params', },
 { 'return_type': 'void',
-  'names': ['glGetQueryObjectiv', 'glGetQueryObjectivARB',
-            'glGetQueryObjectivEXT'],
+  'versions': [{ 'name': 'glGetQueryObjectiv',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],
+  'arguments': 'GLuint id, GLenum pname, GLint* params', },
+{ 'return_type': 'void',
+  'names': ['glGetQueryObjectivARB', 'glGetQueryObjectivEXT'],
   'arguments': 'GLuint id, GLenum pname, GLint* params', },
 { 'return_type': 'void',
   'names': ['glGetQueryObjectui64v', 'glGetQueryObjectui64vEXT'],
   'arguments': 'GLuint id, GLenum pname, GLuint64* params', },
 { 'return_type': 'void',
-  'names': ['glGetQueryObjectuiv'],
+  'versions': [{ 'name': 'glGetQueryObjectuiv',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],
   'arguments': 'GLuint id, GLenum pname, GLuint* params', },
 { 'return_type': 'void',
   'names': ['glGetQueryObjectuivARB', 'glGetQueryObjectuivEXT'],
@@ -518,6 +613,14 @@ GL_FUNCTIONS = [
   'names': ['glGetRenderbufferParameterivEXT', 'glGetRenderbufferParameteriv'],
   'arguments': 'GLenum target, GLenum pname, GLint* params', },
 { 'return_type': 'void',
+  'versions': [{ 'name': 'glGetSamplerParameterfv',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],  # GL 3.2 or higher.
+  'arguments': 'GLuint sampler, GLenum pname, GLfloat* params', },
+{ 'return_type': 'void',
+  'versions': [{ 'name': 'glGetSamplerParameteriv',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],  # GL 3.2 or higher.
+  'arguments': 'GLuint sampler, GLenum pname, GLint* params', },
+{ 'return_type': 'void',
   'names': ['glGetShaderInfoLog'],
   'arguments':
       'GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog', },
@@ -553,13 +656,27 @@ GL_FUNCTIONS = [
   'names': ['glGetTexParameteriv'],
   'arguments': 'GLenum target, GLenum pname, GLint* params', },
 { 'return_type': 'void',
+  'versions': [{ 'name': 'glGetTransformFeedbackVarying',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],
+  'arguments': 'GLuint program, GLuint index, GLsizei bufSize, '
+               'GLsizei* length, GLenum* type, char* name', },
+{ 'return_type': 'void',
   'names': ['glGetTranslatedShaderSourceANGLE'],
   'arguments':
       'GLuint shader, GLsizei bufsize, GLsizei* length, char* source', },
+{ 'return_type': 'GLuint',
+  'versions': [{ 'name': 'glGetUniformBlockIndex',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],  # GL 3.1 or higher.
+  'arguments': 'GLuint program, const char* uniformBlockName', },
 { 'return_type': 'void',
   'names': ['glGetUniformfv'],
   'arguments': 'GLuint program, GLint location, GLfloat* params', },
 { 'return_type': 'void',
+  'versions': [{ 'name': 'glGetUniformIndices',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],  # GL 3.1 or higher.
+  'arguments': 'GLuint program, GLsizei uniformCount, '
+               'const char* const* uniformNames, GLuint* uniformIndices', },
+{ 'return_type': 'void',
   'names': ['glGetUniformiv'],
   'arguments': 'GLuint program, GLint location, GLint* params', },
 { 'return_type': 'GLint',
@@ -607,12 +724,20 @@ GL_FUNCTIONS = [
   'names': ['glIsProgram'],
   'arguments': 'GLuint program', },
 { 'return_type': 'GLboolean',
+  'versions': [{ 'name': 'glIsQuery',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],
+  'arguments': 'GLuint query', },
+{ 'return_type': 'GLboolean',
   'names': ['glIsQueryARB', 'glIsQueryEXT'],
   'arguments': 'GLuint query', },
 { 'return_type': 'GLboolean',
   'names': ['glIsRenderbufferEXT', 'glIsRenderbuffer'],
   'arguments': 'GLuint renderbuffer', },
 { 'return_type': 'GLboolean',
+  'versions': [{ 'name': 'glIsSampler',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],  # GL 3.2 or higher.
+  'arguments': 'GLuint sampler', },
+{ 'return_type': 'GLboolean',
   'names': ['glIsShader'],
   'arguments': 'GLuint shader', },
 { 'return_type': 'GLboolean',
@@ -622,9 +747,13 @@ GL_FUNCTIONS = [
   'names': ['glIsTexture'],
   'arguments': 'GLuint texture', },
 { 'return_type': 'GLboolean',
+  'versions': [{ 'name': 'glIsTransformFeedback',
+                 'gl_versions': ['gl4', 'es3'] }],
+  'arguments': 'GLuint id', },
+{ 'return_type': 'GLboolean',
   'known_as': 'glIsVertexArrayOES',
   'versions': [{ 'name': 'glIsVertexArray',
-                 'gl_versions': ['gl3', 'gl4'] },
+                 'gl_versions': ['gl3', 'gl4', 'es3'] },
                { 'name': 'glIsVertexArray',
                  'extensions': ['GL_ARB_vertex_array_object'] },
                { 'name': 'glIsVertexArrayOES' },
@@ -670,6 +799,10 @@ GL_FUNCTIONS = [
                  'extensions': ['GL_NV_path_rendering'] }],
   'arguments': 'GLenum matrixMode' },
 { 'return_type': 'void',
+  'versions': [{ 'name': 'glPauseTransformFeedback',
+                 'gl_versions': ['gl4', 'es3'] }],
+  'arguments': 'void', },
+{ 'return_type': 'void',
   'names': ['glPixelStorei'],
   'arguments': 'GLenum pname, GLint param', },
 { 'return_type': 'void',
@@ -751,9 +884,29 @@ GL_FUNCTIONS = [
   'arguments': 'GLenum target, GLsizei samples, GLenum internalformat, '
                'GLsizei width, GLsizei height', },
 { 'return_type': 'void',
+  'versions': [{ 'name': 'glResumeTransformFeedback',
+                 'gl_versions': ['gl4', 'es3'] }],
+  'arguments': 'void', },
+{ 'return_type': 'void',
   'names': ['glSampleCoverage'],
   'arguments': 'GLclampf value, GLboolean invert', },
 { 'return_type': 'void',
+  'versions': [{ 'name': 'glSamplerParameterf',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],  # GL 3.2 or higher.
+  'arguments': 'GLuint sampler, GLenum pname, GLfloat param', },
+{ 'return_type': 'void',
+  'versions': [{ 'name': 'glSamplerParameterfv',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],  # GL 3.2 or higher.
+  'arguments': 'GLuint sampler, GLenum pname, const GLfloat* params', },
+{ 'return_type': 'void',
+  'versions': [{ 'name': 'glSamplerParameteri',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],  # GL 3.2 or higher.
+  'arguments': 'GLuint sampler, GLenum pname, GLint param', },
+{ 'return_type': 'void',
+  'versions': [{ 'name': 'glSamplerParameteriv',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],  # GL 3.2 or higher.
+  'arguments': 'GLuint sampler, GLenum pname, const GLint* params', },
+{ 'return_type': 'void',
   'names': ['glScissor'],
   'arguments': 'GLint x, GLint y, GLsizei width, GLsizei height', },
 { 'return_type': 'void',
@@ -869,6 +1022,11 @@ GL_FUNCTIONS = [
 #       'GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, '
 #       'GLenum format, GLenum type, const void* pixels', },
 { 'return_type': 'void',
+  'versions': [{ 'name': 'glTransformFeedbackVaryings',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],
+  'arguments': 'GLuint program, GLsizei count, const char* const* varyings, '
+               'GLenum bufferMode', },
+{ 'return_type': 'void',
   'names': ['glUniform1f'],
   'arguments': 'GLint location, GLfloat x', },
 { 'return_type': 'void',
@@ -949,6 +1107,11 @@ GL_FUNCTIONS = [
                  'gl_versions': ['gl3', 'gl4', 'es3'] }],
   'arguments': 'GLint location, GLsizei count, const GLuint* v', },
 { 'return_type': 'void',
+  'versions': [{ 'name': 'glUniformBlockBinding',
+                 'gl_versions': ['gl3', 'gl4', 'es3'] }],  # GL 3.1 or higher.
+  'arguments': 'GLuint program, GLuint uniformBlockIndex, '
+               'GLuint uniformBlockBinding', },
+{ 'return_type': 'void',
   'names': ['glUniformMatrix2fv'],
   'arguments': 'GLint location, GLsizei count, '
                'GLboolean transpose, const GLfloat* value', },