Skip to content

A
angle
Commit bcae3828 by Clemen Deng Committed by Commit Bot
Options

Auto-generated variables detected as mutable constants

Need to rename kVar* variables to just var Bug: angleproject:3823 Change-Id: I34b9f4eec4ee7829d47dcac2f06f1acc6b35f867 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1758601Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Clemen Deng <clemendeng@google.com>
parent f3ccfba7
Showing with 6 additions and 6 deletions
scripts/code_generation_hashes/ESSL_static_builtins.json
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"src/compiler/translator/ParseContext_autogen.h": "src/compiler/translator/ParseContext_autogen.h":
"48f878f5878e8ab239af7c14e5878b62", "48f878f5878e8ab239af7c14e5878b62",
"src/compiler/translator/SymbolTable_autogen.cpp": "src/compiler/translator/SymbolTable_autogen.cpp":
"49931f9922d8b8d4478658fc76ae2a44", "96ed28ab5a4a213a7077b7bf6fdb5463",
"src/compiler/translator/SymbolTable_autogen.h": "src/compiler/translator/SymbolTable_autogen.h":
"bdb3c8eab0d48267a2f264e3af635e1a", "bdb3c8eab0d48267a2f264e3af635e1a",
"src/compiler/translator/builtin_function_declarations.txt": "src/compiler/translator/builtin_function_declarations.txt":
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
"src/compiler/translator/builtin_variables.json": "src/compiler/translator/builtin_variables.json":
"bbcda061188c066dd887f9ecf5f6f4b4", "bbcda061188c066dd887f9ecf5f6f4b4",
"src/compiler/translator/gen_builtin_symbols.py": "src/compiler/translator/gen_builtin_symbols.py":
"ff3ba3065b88217d72419630d87940e9", "70805846a33bf9b0c47639c80d01f0f8",
"src/compiler/translator/tree_util/BuiltIn_autogen.h": "src/compiler/translator/tree_util/BuiltIn_autogen.h":
"eb49e9f6216e90d11e91d60a2446ac6d", "eb49e9f6216e90d11e91d60a2446ac6d",
"src/tests/compiler_tests/ImmutableString_test_autogen.cpp": "src/tests/compiler_tests/ImmutableString_test_autogen.cpp":
......
src/compiler/translator/SymbolTable_autogen.cpp
This source diff could not be displayed because it is too large. You can view the blob instead.
src/compiler/translator/gen_builtin_symbols.py
...@@ -1020,7 +1020,7 @@ def get_variable_name_to_store_parameters(parameters): ...@@ -1020,7 +1020,7 @@ def get_variable_name_to_store_parameters(parameters):
def define_constexpr_variable(template_args, variable_declarations): def define_constexpr_variable(template_args, variable_declarations):
template_variable_declaration = 'constexpr const TVariable kVar_{name_with_suffix}(BuiltInId::{name_with_suffix}, BuiltInName::{name}, SymbolType::BuiltIn, TExtension::{extension}, {type});' template_variable_declaration = 'constexpr const TVariable var_{name_with_suffix}(BuiltInId::{name_with_suffix}, BuiltInName::{name}, SymbolType::BuiltIn, TExtension::{extension}, {type});'
variable_declarations.append(template_variable_declaration.format(**template_args)) variable_declarations.append(template_variable_declaration.format(**template_args))
...@@ -1213,7 +1213,7 @@ def process_single_function_group( ...@@ -1213,7 +1213,7 @@ def process_single_function_group(
define_constexpr_variable(param_template_args, variable_declarations) define_constexpr_variable(param_template_args, variable_declarations)
defined_parameter_names.add(unique_param_name) defined_parameter_names.add(unique_param_name)
parameters_list.append( parameters_list.append(
'&BuiltInVariable::kVar_{name_with_suffix}'.format(**param_template_args)) '&BuiltInVariable::var_{name_with_suffix}'.format(**param_template_args))
template_args['parameters_var_name'] = get_variable_name_to_store_parameters( template_args['parameters_var_name'] = get_variable_name_to_store_parameters(
parameters) parameters)
...@@ -1407,7 +1407,7 @@ def process_single_variable_group(condition, group_name, group, builtin_id_decla ...@@ -1407,7 +1407,7 @@ def process_single_variable_group(condition, group_name, group, builtin_id_decla
template_get_variable_definition = """const TVariable *{name_with_suffix}() template_get_variable_definition = """const TVariable *{name_with_suffix}()
{{ {{
return &kVar_{name_with_suffix}; return &var_{name_with_suffix};
}} }}
""" """
get_variable_definitions.append( get_variable_definitions.append(
...@@ -1416,7 +1416,7 @@ def process_single_variable_group(condition, group_name, group, builtin_id_decla ...@@ -1416,7 +1416,7 @@ def process_single_variable_group(condition, group_name, group, builtin_id_decla
if level != 'GLSL_BUILTINS': if level != 'GLSL_BUILTINS':
template_name_if = """if (name == BuiltInName::{name}) template_name_if = """if (name == BuiltInName::{name})
{{ {{
return &BuiltInVariable::kVar_{name_with_suffix}; return &BuiltInVariable::var_{name_with_suffix};
}}""" }}"""
name_if = template_name_if.format(**template_args) name_if = template_name_if.format(**template_args)
get_builtin_if_statements.add_obj(level, 'COMMON_BUILTINS', condition, get_builtin_if_statements.add_obj(level, 'COMMON_BUILTINS', condition,
......
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