Skip to content

A
angle
Commit 53d3841c by Jamie Madill Committed by Commit Bot
Options

Refactor entry point gen slightly.

This makes the entry points a bit smaller and avoids redundant return statements. BUG=angleproject:1309 Change-Id: I895c26d4235900578f5acc0eb94a7deef67b946b Reviewed-on: https://chromium-review.googlesource.com/483428 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent b4cf5656
Showing with 3 additions and 6 deletions
scripts/generate_entry_points.py
...@@ -100,12 +100,10 @@ template_entry_point_def = """{return_type}GL_APIENTRY {name}({params}) ...@@ -100,12 +100,10 @@ template_entry_point_def = """{return_type}GL_APIENTRY {name}({params})
{{ {{
context->gatherParams<EntryPoint::{name}>({pass_params}); context->gatherParams<EntryPoint::{name}>({pass_params});
if (!context->skipValidation() && !Validate{name}({validate_params})) if (context->skipValidation() || Validate{name}({validate_params}))
{{ {{
return{default_return}; {return_if_needed}context->{name_lower}({pass_params});
}} }}
{return_if_needed}context->{name_lower}({pass_params});
}} }}
{default_return_if_needed}}} {default_return_if_needed}}}
""" """
...@@ -176,9 +174,8 @@ def format_entry_point_def(cmd_name, proto, params): ...@@ -176,9 +174,8 @@ def format_entry_point_def(cmd_name, proto, params):
comma_if_needed = ", " if len(params) > 0 else "", comma_if_needed = ", " if len(params) > 0 else "",
validate_params = ", ".join(["context"] + pass_params), validate_params = ", ".join(["context"] + pass_params),
format_params = ", ".join(format_params), format_params = ", ".join(format_params),
default_return = "" if default_return == "" else " " + default_return,
return_if_needed = "" if default_return == "" else "return ", return_if_needed = "" if default_return == "" else "return ",
default_return_if_needed = "" if default_return == "" else " return " + default_return + ";\n") default_return_if_needed = "" if default_return == "" else "\n return " + default_return + ";\n")
for cmd_name in gles2_commands: for cmd_name in gles2_commands:
command_xpath = "command/proto[name='" + cmd_name + "']/.." command_xpath = "command/proto[name='" + cmd_name + "']/.."
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment