GLES3: Auto-generate entry point header.

scripts/generate_entry_points.py

@@ -11,15 +11,6 @@ import sys, os, pprint
 import xml.etree.ElementTree as etree
 from datetime import date
 
-def script_relative(path):
-    return os.path.join(os.path.dirname(sys.argv[0]), path)
-
-tree = etree.parse(script_relative('gl.xml'))
-root = tree.getroot()
-
-gles2_xpath = ".//feature[@name='GL_ES_VERSION_2_0']//command"
-gles2_commands = [cmd.attrib['name'] for cmd in root.findall(gles2_xpath)]
-
 template_entry_point_header = """// GENERATED FILE - DO NOT EDIT.
 // Generated by {script_name} using data from {data_source_name}.
 //
@@ -33,7 +24,7 @@ template_entry_point_header = """// GENERATED FILE - DO NOT EDIT.
 #ifndef LIBGLESV2_ENTRYPOINTSGLES{major_version}{minor_version}_AUTOGEN_H_
 #define LIBGLESV2_ENTRYPOINTSGLES{major_version}{minor_version}_AUTOGEN_H_
 
-#include <GLES2/gl{major_version}.h>
+#include <GLES{major_version}/gl{major_version}.h>
 #include <export.h>
 
 namespace gl
@@ -105,9 +96,23 @@ template_entry_point_def = """{return_type}GL_APIENTRY {name}({params})
 {default_return_if_needed}}}
 """
 
+def script_relative(path):
+    return os.path.join(os.path.dirname(sys.argv[0]), path)
+
+tree = etree.parse(script_relative('gl.xml'))
+root = tree.getroot()
+
+gles2_xpath = ".//feature[@name='GL_ES_VERSION_2_0']//command"
+gles2_commands = [cmd.attrib['name'] for cmd in root.findall(gles2_xpath)]
+
+gles3_xpath = ".//feature[@name='GL_ES_VERSION_3_0']//command"
+gles3_commands = [cmd.attrib['name'] for cmd in root.findall(gles3_xpath)]
+
 commands = root.find(".//commands[@namespace='GL']")
 entry_point_decls_gles_2_0 = []
 entry_point_defs_gles_2_0 = []
+entry_point_decls_gles_3_0 = []
+entry_point_defs_gles_3_0 = []
 cmd_names = []
 
 def format_entry_point_decl(cmd_name, proto, params):
@@ -136,14 +141,20 @@ format_dict = {
     "GLintptr": "%d",
     "GLsizei": "%d",
     "GLsizeiptr": "%d",
-    "GLuint": "%d"
+    "GLsync": "0x%0.8p",
+    "GLuint": "%d",
+    "GLuint64": "%llu"
 }
 
 def param_format_string(param):
     if "*" in param:
         return param + " = 0x%0.8p"
     else:
-        return param + " = " + format_dict[just_the_type(param)]
+        type_only = just_the_type(param)
+        if type_only not in format_dict:
+            raise Exception(type_only + " is not a known type in 'format_dict'")
+
+        return param + " = " + format_dict[type_only]
 
 def default_return_value(return_type):
     if return_type == "void":
@@ -152,10 +163,10 @@ def default_return_value(return_type):
         return "0"
     elif return_type == "GLboolean":
         return "GL_FALSE"
-    elif "*" in return_type:
+    elif "*" in return_type or return_type == "GLsync":
         return "nullptr"
     else:
-        print(return_type)
+        raise Exception("Don't know default return type for " + return_type)
 
 def get_context_getter_function(cmd_name):
     if cmd_name == "glGetError":
@@ -190,6 +201,15 @@ for cmd_name in gles2_commands:
     entry_point_decls_gles_2_0 += [format_entry_point_decl(cmd_name, proto, params)]
     entry_point_defs_gles_2_0 += [format_entry_point_def(cmd_name, proto, params)]
 
+for cmd_name in gles3_commands:
+    command_xpath = "command/proto[name='" + cmd_name + "']/.."
+    command = commands.find(command_xpath)
+    params = ["".join(param.itertext()) for param in command.findall("./param")]
+    proto = "".join(command.find("./proto").itertext())
+    cmd_names += [cmd_name]
+    entry_point_decls_gles_3_0 += [format_entry_point_decl(cmd_name, proto, params)]
+    entry_point_defs_gles_3_0 += [format_entry_point_def(cmd_name, proto, params)]
+
 gles_2_0_header = template_entry_point_header.format(
     script_name = os.path.basename(sys.argv[0]),
     data_source_name = "gl.xml",
@@ -206,8 +226,16 @@ gles_2_0_source = template_entry_point_source.format(
     minor_version = 0,
     entry_points = "\n".join(entry_point_defs_gles_2_0))
 
-# TODO(jmadill): Remove manually added entry points.
-manual_cmd_names = ["Invalid"] + [cmd[2:] for cmd in cmd_names] + ["DrawElementsInstanced", "DrawRangeElements", "DrawElementsInstancedANGLE"]
+gles_3_0_header = template_entry_point_header.format(
+    script_name = os.path.basename(sys.argv[0]),
+    data_source_name = "gl.xml",
+    year = date.today().year,
+    major_version = 3,
+    minor_version = 0,
+    entry_points = "\n".join(entry_point_decls_gles_3_0))
+
+# TODO(jmadill): Remove manually added entry points once we auto-gen them.
+manual_cmd_names = ["Invalid"] + [cmd[2:] for cmd in cmd_names] + ["DrawElementsInstancedANGLE"]
 entry_points_enum = template_entry_points_enum_header.format(
     script_name = os.path.basename(sys.argv[0]),
     data_source_name = "gl.xml",
@@ -219,6 +247,8 @@ def path_to(folder, file):
 
 gles_2_0_header_path = path_to("libGLESv2", "entry_points_gles_2_0_autogen.h")
 gles_2_0_source_path = path_to("libGLESv2", "entry_points_gles_2_0_autogen.cpp")
+gles_3_0_header_path = path_to("libGLESv2", "entry_points_gles_3_0_autogen.h")
+gles_3_0_source_path = path_to("libGLESv2", "entry_points_gles_3_0_autogen.cpp")
 entry_points_enum_header_path = path_to("libANGLE", "entry_points_enum_autogen.h")
 
 with open(gles_2_0_header_path, "w") as out:
@@ -229,6 +259,10 @@ with open(gles_2_0_source_path, "w") as out:
     out.write(gles_2_0_source)
     out.close()
 
+with open(gles_3_0_header_path, "w") as out:
+    out.write(gles_3_0_header)
+    out.close()
+
 with open(entry_points_enum_header_path, "w") as out:
     out.write(entry_points_enum)
     out.close()

src/libANGLE/entry_points_enum_autogen.h

@@ -158,8 +158,110 @@ enum class EntryPoint
     VertexAttrib4fv,
     VertexAttribPointer,
     Viewport,
-    DrawElementsInstanced,
+    ReadBuffer,
     DrawRangeElements,
+    TexImage3D,
+    TexSubImage3D,
+    CopyTexSubImage3D,
+    CompressedTexImage3D,
+    CompressedTexSubImage3D,
+    GenQueries,
+    DeleteQueries,
+    IsQuery,
+    BeginQuery,
+    EndQuery,
+    GetQueryiv,
+    GetQueryObjectuiv,
+    UnmapBuffer,
+    GetBufferPointerv,
+    DrawBuffers,
+    UniformMatrix2x3fv,
+    UniformMatrix3x2fv,
+    UniformMatrix2x4fv,
+    UniformMatrix4x2fv,
+    UniformMatrix3x4fv,
+    UniformMatrix4x3fv,
+    BlitFramebuffer,
+    RenderbufferStorageMultisample,
+    FramebufferTextureLayer,
+    MapBufferRange,
+    FlushMappedBufferRange,
+    BindVertexArray,
+    DeleteVertexArrays,
+    GenVertexArrays,
+    IsVertexArray,
+    GetIntegeri_v,
+    BeginTransformFeedback,
+    EndTransformFeedback,
+    BindBufferRange,
+    BindBufferBase,
+    TransformFeedbackVaryings,
+    GetTransformFeedbackVarying,
+    VertexAttribIPointer,
+    GetVertexAttribIiv,
+    GetVertexAttribIuiv,
+    VertexAttribI4i,
+    VertexAttribI4ui,
+    VertexAttribI4iv,
+    VertexAttribI4uiv,
+    GetUniformuiv,
+    GetFragDataLocation,
+    Uniform1ui,
+    Uniform2ui,
+    Uniform3ui,
+    Uniform4ui,
+    Uniform1uiv,
+    Uniform2uiv,
+    Uniform3uiv,
+    Uniform4uiv,
+    ClearBufferiv,
+    ClearBufferuiv,
+    ClearBufferfv,
+    ClearBufferfi,
+    GetStringi,
+    CopyBufferSubData,
+    GetUniformIndices,
+    GetActiveUniformsiv,
+    GetUniformBlockIndex,
+    GetActiveUniformBlockiv,
+    GetActiveUniformBlockName,
+    UniformBlockBinding,
+    DrawArraysInstanced,
+    DrawElementsInstanced,
+    FenceSync,
+    IsSync,
+    DeleteSync,
+    ClientWaitSync,
+    WaitSync,
+    GetInteger64v,
+    GetSynciv,
+    GetInteger64i_v,
+    GetBufferParameteri64v,
+    GenSamplers,
+    DeleteSamplers,
+    IsSampler,
+    BindSampler,
+    SamplerParameteri,
+    SamplerParameteriv,
+    SamplerParameterf,
+    SamplerParameterfv,
+    GetSamplerParameteriv,
+    GetSamplerParameterfv,
+    VertexAttribDivisor,
+    BindTransformFeedback,
+    DeleteTransformFeedbacks,
+    GenTransformFeedbacks,
+    IsTransformFeedback,
+    PauseTransformFeedback,
+    ResumeTransformFeedback,
+    GetProgramBinary,
+    ProgramBinary,
+    ProgramParameteri,
+    InvalidateFramebuffer,
+    InvalidateSubFramebuffer,
+    TexStorage2D,
+    TexStorage3D,
+    GetInternalformativ,
     DrawElementsInstancedANGLE
 };
 }  // namespace gl

src/libGLESv2.gypi

@@ -799,7 +799,7 @@
             'libGLESv2/entry_points_gles_2_0_ext.cpp',
             'libGLESv2/entry_points_gles_2_0_ext.h',
             'libGLESv2/entry_points_gles_3_0.cpp',
-            'libGLESv2/entry_points_gles_3_0.h',
+            'libGLESv2/entry_points_gles_3_0_autogen.h',
             'libGLESv2/entry_points_gles_3_1.cpp',
             'libGLESv2/entry_points_gles_3_1.h',
             'libGLESv2/global_state.cpp',

src/libGLESv2/entry_points_egl.cpp

@@ -10,7 +10,7 @@
 #include "libGLESv2/entry_points_egl_ext.h"
 #include "libGLESv2/entry_points_gles_2_0_autogen.h"
 #include "libGLESv2/entry_points_gles_2_0_ext.h"
-#include "libGLESv2/entry_points_gles_3_0.h"
+#include "libGLESv2/entry_points_gles_3_0_autogen.h"
 #include "libGLESv2/entry_points_gles_3_1.h"
 #include "libGLESv2/global_state.h"
 

src/libGLESv2/entry_points_gles_3_0.cpp

@@ -6,8 +6,6 @@
 
 // entry_points_gles_3_0.cpp : Implements the GLES 3.0 entry points.
 
-#include "libGLESv2/entry_points_gles_3_0.h"
-
 #include "libANGLE/Context.h"
 #include "libANGLE/validationES3.h"
 #include "libGLESv2/global_state.h"

src/libGLESv2/entry_points_gles_3_0.h → src/libGLESv2/entry_points_gles_3_0_autogen.h

+// GENERATED FILE - DO NOT EDIT.
+// Generated by generate_entry_points.py using data from gl.xml.
 //
-// Copyright(c) 2014 The ANGLE Project Authors. All rights reserved.
+// Copyright 2017 The ANGLE Project Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
+// entry_points_gles_3_0_autogen.h:
+//   Defines the GLES 3.0 entry points.
 
-// entry_points_gles_3_0.h : Defines the GLES 3.0 entry points.
-
-#ifndef LIBGLESV2_ENTRYPOINTGLES30_H_
-#define LIBGLESV2_ENTRYPOINTGLES30_H_
+#ifndef LIBGLESV2_ENTRYPOINTSGLES30_AUTOGEN_H_
+#define LIBGLESV2_ENTRYPOINTSGLES30_AUTOGEN_H_
 
 #include <GLES3/gl3.h>
 #include <export.h>
 
 namespace gl
 {
-
-ANGLE_EXPORT void GL_APIENTRY ReadBuffer(GLenum mode);
+ANGLE_EXPORT void GL_APIENTRY ReadBuffer(GLenum src);
 ANGLE_EXPORT void GL_APIENTRY DrawRangeElements(GLenum mode,
                                                 GLuint start,
                                                 GLuint end,
@@ -136,7 +137,7 @@ ANGLE_EXPORT void GL_APIENTRY GenVertexArrays(GLsizei n, GLuint *arrays);
 ANGLE_EXPORT GLboolean GL_APIENTRY IsVertexArray(GLuint array);
 ANGLE_EXPORT void GL_APIENTRY GetIntegeri_v(GLenum target, GLuint index, GLint *data);
 ANGLE_EXPORT void GL_APIENTRY BeginTransformFeedback(GLenum primitiveMode);
-ANGLE_EXPORT void GL_APIENTRY EndTransformFeedback(void);
+ANGLE_EXPORT void GL_APIENTRY EndTransformFeedback();
 ANGLE_EXPORT void GL_APIENTRY
 BindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
 ANGLE_EXPORT void GL_APIENTRY BindBufferBase(GLenum target, GLuint index, GLuint buffer);
@@ -210,18 +211,18 @@ ANGLE_EXPORT void GL_APIENTRY UniformBlockBinding(GLuint program,
 ANGLE_EXPORT void GL_APIENTRY DrawArraysInstanced(GLenum mode,
                                                   GLint first,
                                                   GLsizei count,
-                                                  GLsizei instanceCount);
+                                                  GLsizei instancecount);
 ANGLE_EXPORT void GL_APIENTRY DrawElementsInstanced(GLenum mode,
                                                     GLsizei count,
                                                     GLenum type,
                                                     const void *indices,
-                                                    GLsizei instanceCount);
+                                                    GLsizei instancecount);
 ANGLE_EXPORT GLsync GL_APIENTRY FenceSync(GLenum condition, GLbitfield flags);
 ANGLE_EXPORT GLboolean GL_APIENTRY IsSync(GLsync sync);
 ANGLE_EXPORT void GL_APIENTRY DeleteSync(GLsync sync);
 ANGLE_EXPORT GLenum GL_APIENTRY ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout);
 ANGLE_EXPORT void GL_APIENTRY WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout);
-ANGLE_EXPORT void GL_APIENTRY GetInteger64v(GLenum pname, GLint64 *params);
+ANGLE_EXPORT void GL_APIENTRY GetInteger64v(GLenum pname, GLint64 *data);
 ANGLE_EXPORT void GL_APIENTRY
 GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
 ANGLE_EXPORT void GL_APIENTRY GetInteger64i_v(GLenum target, GLuint index, GLint64 *data);
@@ -243,8 +244,8 @@ ANGLE_EXPORT void GL_APIENTRY BindTransformFeedback(GLenum target, GLuint id);
 ANGLE_EXPORT void GL_APIENTRY DeleteTransformFeedbacks(GLsizei n, const GLuint *ids);
 ANGLE_EXPORT void GL_APIENTRY GenTransformFeedbacks(GLsizei n, GLuint *ids);
 ANGLE_EXPORT GLboolean GL_APIENTRY IsTransformFeedback(GLuint id);
-ANGLE_EXPORT void GL_APIENTRY PauseTransformFeedback(void);
-ANGLE_EXPORT void GL_APIENTRY ResumeTransformFeedback(void);
+ANGLE_EXPORT void GL_APIENTRY PauseTransformFeedback();
+ANGLE_EXPORT void GL_APIENTRY ResumeTransformFeedback();
 ANGLE_EXPORT void GL_APIENTRY GetProgramBinary(GLuint program,
                                                GLsizei bufSize,
                                                GLsizei *length,
@@ -278,6 +279,6 @@ ANGLE_EXPORT void GL_APIENTRY GetInternalformativ(GLenum target,
                                                   GLenum pname,
                                                   GLsizei bufSize,
                                                   GLint *params);
-}
+}  // namespace gl
 
-#endif  // LIBGLESV2_ENTRYPOINTGLES30_H_
+#endif  // LIBGLESV2_ENTRYPOINTSGLES30_AUTOGEN_H_

src/libGLESv2/libGLESv2.cpp

@@ -8,7 +8,7 @@
 
 #include "libGLESv2/entry_points_gles_2_0_autogen.h"
 #include "libGLESv2/entry_points_gles_2_0_ext.h"
-#include "libGLESv2/entry_points_gles_3_0.h"
+#include "libGLESv2/entry_points_gles_3_0_autogen.h"
 #include "libGLESv2/entry_points_gles_3_1.h"
 
 #include "common/event_tracer.h"