GLES2: Auto-generate entry points file.

scripts/generate_entry_points.py

@@ -44,10 +44,76 @@ namespace gl
 #endif  // LIBGLESV2_ENTRYPOINTSGLES{major_version}{minor_version}_AUTOGEN_H_
 """
 
+template_entry_point_source = """// GENERATED FILE - DO NOT EDIT.
+// Generated by {script_name} using data from {data_source_name}.
+//
+// Copyright {year} 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_{major_version}_{minor_version}_autogen.cpp:
+//   Defines the GLES {major_version}.{minor_version} entry points.
+
+#include "libGLESv2/entry_points_gles_{major_version}_{minor_version}_autogen.h"
+
+#include "common/debug.h"
+#include "libANGLE/Context.h"
+#include "libANGLE/validationES2.h"
+#include "libGLESv2/global_state.h"
+
+namespace gl
+{{
+{entry_points}}}  // namespace gl
+"""
+
+template_entry_points_enum_header = """// GENERATED FILE - DO NOT EDIT.
+// Generated by {script_name} using data from {data_source_name}.
+//
+// Copyright {year} 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_enum_autogen.h:
+//   Defines the GLES entry points enumeration.
+
+#ifndef LIBGLESV2_ENTRYPOINTSENUM_AUTOGEN_H_
+#define LIBGLESV2_ENTRYPOINTSENUM_AUTOGEN_H_
+
+namespace gl
+{{
+enum class EntryPoint
+{{
+{entry_points_list}
+}};
+}}  // namespace gl
+#endif  // LIBGLESV2_ENTRY_POINTS_ENUM_AUTOGEN_H_
+"""
+
 template_entry_point_decl = """ANGLE_EXPORT {return_type}GL_APIENTRY {name}({params});"""
 
+template_entry_point_def = """{return_type}GL_APIENTRY {name}({params})
+{{
+    EVENT("({format_params})"{comma_if_needed}{pass_params});
+
+    Context *context = GetValidGlobalContext();
+    if (context)
+    {{
+        context->gatherParams<EntryPoint::{name}>({pass_params});
+
+        if (!context->skipValidation() && !Validate{name}({validate_params}))
+        {{
+            return{default_return};
+        }}
+
+        {return_if_needed}context->{name_lower}({pass_params});
+    }}
+{default_return_if_needed}}}
+"""
+
 commands = root.find(".//commands[@namespace='GL']")
 entry_point_decls_gles_2_0 = []
+entry_point_defs_gles_2_0 = []
+cmd_names = []
 
 def format_entry_point_decl(cmd_name, proto, params):
     return template_entry_point_decl.format(
@@ -55,12 +121,73 @@ def format_entry_point_decl(cmd_name, proto, params):
         return_type = proto[:-len(cmd_name)],
         params = ", ".join(params))
 
+def type_name_sep_index(param):
+    space = param.rfind(" ")
+    pointer = param.rfind("*")
+    return max(space, pointer)
+
+def just_the_type(param):
+    return param[:type_name_sep_index(param)]
+
+def just_the_name(param):
+    return param[type_name_sep_index(param)+1:]
+
+format_dict = {
+    "GLbitfield": "0x%X",
+    "GLboolean": "%u",
+    "GLenum": "0x%X",
+    "GLfloat": "%f",
+    "GLint": "%d",
+    "GLintptr": "%d",
+    "GLsizei": "%d",
+    "GLsizeiptr": "%d",
+    "GLuint": "%d"
+}
+
+def param_format_string(param):
+    if "*" in param:
+        return param + " = 0x%0.8p"
+    else:
+        return param + " = " + format_dict[just_the_type(param)]
+
+def default_return_value(return_type):
+    if return_type == "void":
+        return ""
+    elif return_type == "GLenum" or return_type == "GLint" or return_type == "GLuint":
+        return "0"
+    elif return_type == "GLboolean":
+        return "GL_FALSE"
+    elif "*" in return_type:
+        return "nullptr"
+    else:
+        print(return_type)
+
+def format_entry_point_def(cmd_name, proto, params):
+    pass_params = [just_the_name(param) for param in params]
+    format_params = [param_format_string(param) for param in params]
+    return_type = proto[:-len(cmd_name)]
+    default_return = default_return_value(return_type.strip())
+    return template_entry_point_def.format(
+        name = cmd_name[2:],
+        name_lower = cmd_name[2:3].lower() + cmd_name[3:],
+        return_type = return_type,
+        params = ", ".join(params),
+        pass_params = ", ".join(pass_params),
+        comma_if_needed = ", " if len(params) > 0 else "",
+        validate_params = ", ".join(["context"] + pass_params),
+        format_params = ", ".join(format_params),
+        default_return = "" if default_return == "" else " " + default_return,
+        return_if_needed = "" if default_return == "" else "return ",
+        default_return_if_needed = "" if default_return == "" else "    return " + default_return + ";\n")
+
 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)]
 
 gles_2_0_header = template_entry_point_header.format(
     script_name = os.path.basename(sys.argv[0]),
@@ -70,11 +197,37 @@ gles_2_0_header = template_entry_point_header.format(
     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))
+
+# TODO(jmadill): Remove manually added entry points.
+manual_cmd_names = ["Invalid"] + [cmd[2:] for cmd in cmd_names] + ["DrawElementsInstanced", "DrawRangeElements", "DrawElementsInstancedANGLE"]
+entry_points_enum = template_entry_points_enum_header.format(
+    script_name = os.path.basename(sys.argv[0]),
+    data_source_name = "gl.xml",
+    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")
+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(entry_points_enum_header_path, "w") as out:
+    out.write(entry_points_enum)
+    out.close()
\ No newline at end of file

src/libANGLE/entry_points_enum_autogen.h

+// GENERATED FILE - DO NOT EDIT.
+// Generated by generate_entry_points.py using data from gl.xml.
+//
+// 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_enum_autogen.h:
+//   Defines the GLES entry points enumeration.
+
+#ifndef LIBGLESV2_ENTRYPOINTSENUM_AUTOGEN_H_
+#define LIBGLESV2_ENTRYPOINTSENUM_AUTOGEN_H_
+
+namespace gl
+{
+enum class EntryPoint
+{
+    Invalid,
+    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,
+    DrawElementsInstanced,
+    DrawRangeElements,
+    DrawElementsInstancedANGLE
+};
+}  // namespace gl
+#endif  // LIBGLESV2_ENTRY_POINTS_ENUM_AUTOGEN_H_

src/libANGLE/params.h

@@ -14,21 +14,12 @@
 #include "common/Optional.h"
 #include "common/angleutils.h"
 #include "common/mathutil.h"
+#include "libANGLE/entry_points_enum_autogen.h"
 
 namespace gl
 {
 class Context;
 
-enum class EntryPoint
-{
-    Invalid,
-    DrawArrays,
-    DrawElements,
-    DrawElementsInstanced,
-    DrawElementsInstancedANGLE,
-    DrawRangeElements,
-};
-
 template <EntryPoint EP>
 struct EntryPointParam;
 

src/libGLESv2.gypi

@@ -202,6 +202,7 @@
             'libANGLE/angletypes.cpp',
             'libANGLE/angletypes.h',
             'libANGLE/angletypes.inl',
+            'libANGLE/entry_points_enum_autogen.h',
             'libANGLE/es3_copy_conversion_table_autogen.cpp',
             'libANGLE/features.h',
             'libANGLE/format_map_autogen.cpp',
@@ -748,7 +749,7 @@
             'libGLESv2/entry_points_egl.h',
             'libGLESv2/entry_points_egl_ext.cpp',
             'libGLESv2/entry_points_egl_ext.h',
-            'libGLESv2/entry_points_gles_2_0.cpp',
+            'libGLESv2/entry_points_gles_2_0_autogen.cpp',
             'libGLESv2/entry_points_gles_2_0_autogen.h',
             'libGLESv2/entry_points_gles_2_0_ext.cpp',
             'libGLESv2/entry_points_gles_2_0_ext.h',