Skip to content

A
angle
Commit 547edfe2 by jchen10 Committed by Commit Bot
Options

Fix angle::Format::ID in gen_dxgi_format_table.py

The dxgi_format_map_autogen.cpp was updated, but the generating script was missed to submit in https://crrev.com/c/1142299. Bug: angleproject:2729 Change-Id: I8d726854581d27881a737f12457482ac955e6312 Reviewed-on: https://chromium-review.googlesource.com/1242853 Commit-Queue: Jie A Chen <jie.a.chen@intel.com> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent cf8ad760
Showing with 6 additions and 3 deletions
scripts/run_code_generation.py
...@@ -75,6 +75,7 @@ generators = { ...@@ -75,6 +75,7 @@ generators = {
'src/libANGLE/renderer/angle_format.py', 'src/libANGLE/renderer/angle_format.py',
'src/libANGLE/renderer/angle_format_map.json', 'src/libANGLE/renderer/angle_format_map.json',
'src/libANGLE/renderer/d3d/d3d11/dxgi_format_data.json', 'src/libANGLE/renderer/d3d/d3d11/dxgi_format_data.json',
'src/libANGLE/renderer/gen_angle_format_table.py',
], ],
'script': 'src/libANGLE/renderer/d3d/d3d11/gen_dxgi_format_table.py', 'script': 'src/libANGLE/renderer/d3d/d3d11/gen_dxgi_format_table.py',
}, },
......
scripts/run_code_generation_hashes.json
...@@ -30,7 +30,9 @@ ...@@ -30,7 +30,9 @@
"DXGI format:src/libANGLE/renderer/d3d/d3d11/dxgi_format_data.json": "DXGI format:src/libANGLE/renderer/d3d/d3d11/dxgi_format_data.json":
"24f525b05dc665fbbc8c6d68fb863719", "24f525b05dc665fbbc8c6d68fb863719",
"DXGI format:src/libANGLE/renderer/d3d/d3d11/gen_dxgi_format_table.py": "DXGI format:src/libANGLE/renderer/d3d/d3d11/gen_dxgi_format_table.py":
"2932a5e1c3c846be0169e29a4f9c72e8", "8ea01df6cb7f160772d3c85dd5164890",
"DXGI format:src/libANGLE/renderer/gen_angle_format_table.py":
"9de29b6ca59a05747623c0dc32344b14",
"ESSL static builtins:src/compiler/translator/builtin_function_declarations.txt": "ESSL static builtins:src/compiler/translator/builtin_function_declarations.txt":
"336c2a275fe35bce1adc7e9b5918bdb0", "336c2a275fe35bce1adc7e9b5918bdb0",
"ESSL static builtins:src/compiler/translator/builtin_variables.json": "ESSL static builtins:src/compiler/translator/builtin_variables.json":
......
src/libANGLE/renderer/d3d/d3d11/gen_dxgi_format_table.py
...@@ -58,7 +58,7 @@ const Format &GetFormat(DXGI_FORMAT dxgiFormat) ...@@ -58,7 +58,7 @@ const Format &GetFormat(DXGI_FORMAT dxgiFormat)
}} }}
UNREACHABLE(); UNREACHABLE();
return Format::Get(Format::ID::NONE); return Format::Get(FormatID::NONE);
}} }}
}} // namespace d3d11_angle }} // namespace d3d11_angle
...@@ -117,7 +117,7 @@ for dxgi_format, angle_format in sorted(dxgi_map.iteritems()): ...@@ -117,7 +117,7 @@ for dxgi_format, angle_format in sorted(dxgi_map.iteritems()):
angle_format = dxgi_format angle_format = dxgi_format
if angle_format in all_angle: if angle_format in all_angle:
angle_format = "Format::Get(Format::ID::" + angle_format + ")" angle_format = "Format::Get(FormatID::" + angle_format + ")"
format_cases += format_case(dxgi_format, angle_format) format_cases += format_case(dxgi_format, angle_format)
else: else:
format_cases += undefined_case(dxgi_format) format_cases += undefined_case(dxgi_format)
......
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