GLES31: Auto-generate entry points source.

scripts/generate_entry_points.py

@@ -24,9 +24,9 @@ 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 <GLES{major_version}/gl{major_version}.h>
+#include <GLES{major_version}/gl{major_version}{minor_version_nonzero}.h>
 #include <export.h>
-
+{include_platform}
 namespace gl
 {{
 {entry_points}
@@ -46,7 +46,7 @@ template_entry_point_source = """// GENERATED FILE - DO NOT EDIT.
 //   Defines the GLES {major_version}.{minor_version} entry points.
 
 #include "libANGLE/Context.h"
-#include "libANGLE/validationES{major_version}.h"
+#include "libANGLE/validationES{major_version}{minor_version_nonzero}.h"
 #include "libGLESv2/global_state.h"
 
 namespace gl
@@ -118,18 +118,7 @@ def script_relative(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 = []
 
 with open(script_relative('entry_point_packed_gl_enums.json')) as f:
@@ -244,55 +233,58 @@ def format_entry_point_def_oldstyle(cmd_name, proto, params):
         default_value_if_needed = "" if default_return == "" else (" " + default_return),
         context_getter = get_context_getter_function(cmd_name))
 
-for cmd_name in gles2_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_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",
-    year = date.today().year,
-    major_version = 2,
-    minor_version = 0,
-    entry_points = "\n".join(entry_point_decls_gles_2_0))
-
-gles_2_0_source = template_entry_point_source.format(
-    script_name = os.path.basename(sys.argv[0]),
-    data_source_name = "gl.xml",
-    year = date.today().year,
-    major_version = 2,
-    minor_version = 0,
-    entry_points = "\n".join(entry_point_defs_gles_2_0))
-
-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))
+def path_to(folder, file):
+    return os.path.join(script_relative(".."), "src", folder, file)
 
-gles_3_0_source = template_entry_point_source.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_defs_gles_3_0))
+for major_version, minor_version in [[2, 0], [3, 0], [3, 1]]:
+    gles_xpath = ".//feature[@name='GL_ES_VERSION_{}_{}']//command".format(major_version, minor_version)
+    gles_commands = [cmd.attrib['name'] for cmd in root.findall(gles_xpath)]
+
+    entry_point_decls = []
+    entry_point_defs = []
+    for cmd_name in gles_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 += [format_entry_point_decl(cmd_name, proto, params)]
+        if major_version == 3 and minor_version == 1:
+            entry_point_defs += [format_entry_point_def_oldstyle(cmd_name, proto, params)]
+        else:
+            entry_point_defs += [format_entry_point_def(cmd_name, proto, params)]
+
+    for type in ["header", "source"]:
+        if type == "header":
+            template = template_entry_point_header
+            entry_points = "\n".join(entry_point_decls)
+            suffix = "h"
+        else:
+            template = template_entry_point_source
+            entry_points = "\n".join(entry_point_defs)
+            suffix = "cpp"
+
+        if type == "header" and major_version == 3 and minor_version == 1:
+            # We include the platform.h header since it undefines the conflicting MemoryBarrier macro.
+            include_platform = "\n#include \"common/platform.h\"\n"
+        else:
+            include_platform = ""
+
+        content = template.format(
+            script_name = os.path.basename(sys.argv[0]),
+            data_source_name = "gl.xml",
+            year = date.today().year,
+            major_version = major_version,
+            minor_version = minor_version,
+            minor_version_nonzero = minor_version if minor_version else "",
+            include_platform = include_platform,
+            entry_points = entry_points)
+
+        path = path_to("libGLESv2", "entry_points_gles_{}_{}_autogen.{}".format(major_version, minor_version, suffix))
+
+        with open(path, "w") as out:
+            out.write(content)
+            out.close()
 
 # TODO(jmadill): Remove manually added entry points once we auto-gen them.
 manual_cmd_names = ["Invalid"] + [cmd[2:] for cmd in cmd_names] + ["DrawElementsInstancedANGLE"]
@@ -302,31 +294,7 @@ entry_points_enum = template_entry_points_enum_header.format(
     year = date.today().year,
     entry_points_list = ",\n".join(["    " + cmd for cmd in manual_cmd_names]))
 
-def path_to(folder, file):
-    return os.path.join(script_relative(".."), "src", 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:
-    out.write(gles_2_0_header)
-    out.close()
-
-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(gles_3_0_source_path, "w") as out:
-    out.write(gles_3_0_source)
-    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

@@ -262,6 +262,74 @@ enum class EntryPoint
     TexStorage2D,
     TexStorage3D,
     GetInternalformativ,
+    DispatchCompute,
+    DispatchComputeIndirect,
+    DrawArraysIndirect,
+    DrawElementsIndirect,
+    FramebufferParameteri,
+    GetFramebufferParameteriv,
+    GetProgramInterfaceiv,
+    GetProgramResourceIndex,
+    GetProgramResourceName,
+    GetProgramResourceiv,
+    GetProgramResourceLocation,
+    UseProgramStages,
+    ActiveShaderProgram,
+    CreateShaderProgramv,
+    BindProgramPipeline,
+    DeleteProgramPipelines,
+    GenProgramPipelines,
+    IsProgramPipeline,
+    GetProgramPipelineiv,
+    ProgramUniform1i,
+    ProgramUniform2i,
+    ProgramUniform3i,
+    ProgramUniform4i,
+    ProgramUniform1ui,
+    ProgramUniform2ui,
+    ProgramUniform3ui,
+    ProgramUniform4ui,
+    ProgramUniform1f,
+    ProgramUniform2f,
+    ProgramUniform3f,
+    ProgramUniform4f,
+    ProgramUniform1iv,
+    ProgramUniform2iv,
+    ProgramUniform3iv,
+    ProgramUniform4iv,
+    ProgramUniform1uiv,
+    ProgramUniform2uiv,
+    ProgramUniform3uiv,
+    ProgramUniform4uiv,
+    ProgramUniform1fv,
+    ProgramUniform2fv,
+    ProgramUniform3fv,
+    ProgramUniform4fv,
+    ProgramUniformMatrix2fv,
+    ProgramUniformMatrix3fv,
+    ProgramUniformMatrix4fv,
+    ProgramUniformMatrix2x3fv,
+    ProgramUniformMatrix3x2fv,
+    ProgramUniformMatrix2x4fv,
+    ProgramUniformMatrix4x2fv,
+    ProgramUniformMatrix3x4fv,
+    ProgramUniformMatrix4x3fv,
+    ValidateProgramPipeline,
+    GetProgramPipelineInfoLog,
+    BindImageTexture,
+    GetBooleani_v,
+    MemoryBarrier,
+    MemoryBarrierByRegion,
+    TexStorage2DMultisample,
+    GetMultisamplefv,
+    SampleMaski,
+    GetTexLevelParameteriv,
+    GetTexLevelParameterfv,
+    BindVertexBuffer,
+    VertexAttribFormat,
+    VertexAttribIFormat,
+    VertexAttribBinding,
+    VertexBindingDivisor,
     DrawElementsInstancedANGLE
 };
 }  // namespace gl

src/libGLESv2.gypi

@@ -824,8 +824,8 @@
             'libGLESv2/entry_points_gles_2_0_ext.h',
             'libGLESv2/entry_points_gles_3_0_autogen.cpp',
             'libGLESv2/entry_points_gles_3_0_autogen.h',
-            'libGLESv2/entry_points_gles_3_1.cpp',
-            'libGLESv2/entry_points_gles_3_1.h',
+            'libGLESv2/entry_points_gles_3_1_autogen.cpp',
+            'libGLESv2/entry_points_gles_3_1_autogen.h',
             'libGLESv2/global_state.cpp',
             'libGLESv2/global_state.h',
             'libGLESv2/libGLESv2.cpp',

src/libGLESv2/entry_points_gles_3_1.h → src/libGLESv2/entry_points_gles_3_1_autogen.h

+// GENERATED FILE - DO NOT EDIT.
+// Generated by generate_entry_points.py using data from gl.xml.
 //
-// Copyright(c) 2016 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_1_autogen.h:
+//   Defines the GLES 3.1 entry points.
 
-// entry_points_gles_3_1.h : Defines the GLES 3.1 entry points.
-
-#ifndef LIBGLESV2_ENTRYPOINTGLES31_H_
-#define LIBGLESV2_ENTRYPOINTGLES31_H_
+#ifndef LIBGLESV2_ENTRYPOINTSGLES31_AUTOGEN_H_
+#define LIBGLESV2_ENTRYPOINTSGLES31_AUTOGEN_H_
 
 #include <GLES3/gl31.h>
 #include <export.h>
 
-// we include the platform.h header since it undefines the conflicting MemoryBarrier macro
 #include "common/platform.h"
 
 namespace gl
 {
-
-ANGLE_EXPORT void GL_APIENTRY DispatchCompute(GLuint numGroupsX,
-                                              GLuint numGroupsY,
-                                              GLuint numGroupsZ);
+ANGLE_EXPORT void GL_APIENTRY DispatchCompute(GLuint num_groups_x,
+                                              GLuint num_groups_y,
+                                              GLuint num_groups_z);
 ANGLE_EXPORT void GL_APIENTRY DispatchComputeIndirect(GLintptr indirect);
 ANGLE_EXPORT void GL_APIENTRY DrawArraysIndirect(GLenum mode, const void *indirect);
 ANGLE_EXPORT void GL_APIENTRY DrawElementsIndirect(GLenum mode, GLenum type, const void *indirect);
@@ -190,7 +190,6 @@ ANGLE_EXPORT void GL_APIENTRY BindImageTexture(GLuint unit,
                                                GLenum access,
                                                GLenum format);
 ANGLE_EXPORT void GL_APIENTRY GetBooleani_v(GLenum target, GLuint index, GLboolean *data);
-
 ANGLE_EXPORT void GL_APIENTRY MemoryBarrier(GLbitfield barriers);
 ANGLE_EXPORT void GL_APIENTRY MemoryBarrierByRegion(GLbitfield barriers);
 ANGLE_EXPORT void GL_APIENTRY TexStorage2DMultisample(GLenum target,
@@ -224,6 +223,6 @@ ANGLE_EXPORT void GL_APIENTRY VertexAttribIFormat(GLuint attribindex,
                                                   GLuint relativeoffset);
 ANGLE_EXPORT void GL_APIENTRY VertexAttribBinding(GLuint attribindex, GLuint bindingindex);
 ANGLE_EXPORT void GL_APIENTRY VertexBindingDivisor(GLuint bindingindex, GLuint divisor);
-};
+}  // namespace gl
 
-#endif  // LIBGLESV2_ENTRYPOINTGLES31_H_
+#endif  // LIBGLESV2_ENTRYPOINTSGLES31_AUTOGEN_H_

src/libGLESv2/gen_proc_table.py

@@ -32,7 +32,7 @@ template_cpp = """// GENERATED FILE - DO NOT EDIT.
 #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_autogen.h"
-#include "libGLESv2/entry_points_gles_3_1.h"
+#include "libGLESv2/entry_points_gles_3_1_autogen.h"
 #include "platform/Platform.h"
 
 #define P(FUNC) reinterpret_cast<__eglMustCastToProperFunctionPointerType>(FUNC)

src/libGLESv2/libGLESv2.cpp

@@ -9,7 +9,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_autogen.h"
-#include "libGLESv2/entry_points_gles_3_1.h"
+#include "libGLESv2/entry_points_gles_3_1_autogen.h"
 
 #include "common/event_tracer.h"
 

src/libGLESv2/proc_table_autogen.cpp

@@ -16,7 +16,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_autogen.h"
-#include "libGLESv2/entry_points_gles_3_1.h"
+#include "libGLESv2/entry_points_gles_3_1_autogen.h"
 #include "platform/Platform.h"
 
 #define P(FUNC) reinterpret_cast<__eglMustCastToProperFunctionPointerType>(FUNC)