From 547edfe22ccabdd8056766e86b0abe8365cec56c Mon Sep 17 00:00:00 2001 From: jchen10 Date: Tue, 25 Sep 2018 21:17:56 +0800 Subject: [PATCH] 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 Reviewed-by: Geoff Lang --- scripts/run_code_generation.py | 1 + scripts/run_code_generation_hashes.json | 4 +++- src/libANGLE/renderer/d3d/d3d11/gen_dxgi_format_table.py | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/run_code_generation.py b/scripts/run_code_generation.py index 809cbb838..0dc82d2d2 100755 --- a/scripts/run_code_generation.py +++ b/scripts/run_code_generation.py @@ -75,6 +75,7 @@ generators = { 'src/libANGLE/renderer/angle_format.py', 'src/libANGLE/renderer/angle_format_map.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', }, diff --git a/scripts/run_code_generation_hashes.json b/scripts/run_code_generation_hashes.json index 4162b3cb1..bef0ddb17 100644 --- a/scripts/run_code_generation_hashes.json +++ b/scripts/run_code_generation_hashes.json @@ -30,7 +30,9 @@ "DXGI format:src/libANGLE/renderer/d3d/d3d11/dxgi_format_data.json": "24f525b05dc665fbbc8c6d68fb863719", "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": "336c2a275fe35bce1adc7e9b5918bdb0", "ESSL static builtins:src/compiler/translator/builtin_variables.json": diff --git a/src/libANGLE/renderer/d3d/d3d11/gen_dxgi_format_table.py b/src/libANGLE/renderer/d3d/d3d11/gen_dxgi_format_table.py index f3ca1d82e..38da20933 100644 --- a/src/libANGLE/renderer/d3d/d3d11/gen_dxgi_format_table.py +++ b/src/libANGLE/renderer/d3d/d3d11/gen_dxgi_format_table.py @@ -58,7 +58,7 @@ const Format &GetFormat(DXGI_FORMAT dxgiFormat) }} UNREACHABLE(); - return Format::Get(Format::ID::NONE); + return Format::Get(FormatID::NONE); }} }} // namespace d3d11_angle @@ -117,7 +117,7 @@ for dxgi_format, angle_format in sorted(dxgi_map.iteritems()): angle_format = dxgi_format 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) else: format_cases += undefined_case(dxgi_format)