diff options
| author | Shahbaz Youssefi <syoussefi@chromium.org> | 2024-04-18 16:09:48 -0400 |
|---|---|---|
| committer | Angle LUCI CQ <angle-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2024-04-18 21:25:02 +0000 |
| commit | c75b03ad1ca99d11cf0adf1efe5188a55acaa7cf (patch) | |
| tree | 7de41b0ad30c9d11ec658abce98e96cc67537937 | |
| parent | d4abe62268f302e0df2d51cb655408a81361aa38 (diff) | |
| download | angle-c75b03ad1ca99d11cf0adf1efe5188a55acaa7cf.tar.gz | |
Vulkan: Remove duplicated fallback entry in vk_format_map.json
Bug: b/335496851
Change-Id: Id5fe805a15ae4fa4b09ffbf05fcf7b6d3d79b1ab
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5463921
Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
Reviewed-by: Yuxin Hu <yuxinhu@google.com>
4 files changed, 6 insertions, 13 deletions
diff --git a/scripts/code_generation_hashes/Vulkan_format.json b/scripts/code_generation_hashes/Vulkan_format.json index 258d4b2385..b3f776147d 100644 --- a/scripts/code_generation_hashes/Vulkan_format.json +++ b/scripts/code_generation_hashes/Vulkan_format.json @@ -4,9 +4,9 @@ "src/libANGLE/renderer/angle_format_map.json": "eab6744df71f7bf6bfe9e8bb39949b79", "src/libANGLE/renderer/vulkan/gen_vk_format_table.py": - "0bf4ca6e2a15c79ab67f2886d73578d7", + "d7c30a8fda41b22f7fbdfc385166e0c9", "src/libANGLE/renderer/vulkan/vk_format_map.json": - "e452d2f42133783544f01675540f9765", + "096290d605cbed91ccef9a81bab31984", "src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp": "59a4fc5410e8c81ba7dab87fb87b2253" } diff --git a/scripts/code_generation_hashes/Vulkan_mandatory_format_support_table.json b/scripts/code_generation_hashes/Vulkan_mandatory_format_support_table.json index cd162f3d23..bb9187adb2 100644 --- a/scripts/code_generation_hashes/Vulkan_mandatory_format_support_table.json +++ b/scripts/code_generation_hashes/Vulkan_mandatory_format_support_table.json @@ -4,7 +4,7 @@ "src/libANGLE/renderer/vulkan/gen_vk_mandatory_format_support_table.py": "ffb3d44c853669c2c260b96b3808fcf3", "src/libANGLE/renderer/vulkan/vk_format_map.json": - "e452d2f42133783544f01675540f9765", + "096290d605cbed91ccef9a81bab31984", "src/libANGLE/renderer/vulkan/vk_mandatory_format_support_data.json": "fa2bd54c1bb0ab2cf1d386061a4bc5c5", "src/libANGLE/renderer/vulkan/vk_mandatory_format_support_table_autogen.cpp": diff --git a/src/libANGLE/renderer/vulkan/gen_vk_format_table.py b/src/libANGLE/renderer/vulkan/gen_vk_format_table.py index 28b69f07a7..886c674618 100644 --- a/src/libANGLE/renderer/vulkan/gen_vk_format_table.py +++ b/src/libANGLE/renderer/vulkan/gen_vk_format_table.py @@ -181,13 +181,6 @@ def gen_format_case(angle, internal_format, vk_json_data): fallbacks += compressed if format in vk_map: - # if the fallbacks already contains the format, we should remove - # it from the fallbacks list before adding it as the first element - # in the fallbacks list. This prevents duplicated items in the - # fallbacks list. - if format in fallbacks: - fallbacks.remove(format) - assert format not in fallbacks fallbacks = [format] + fallbacks diff --git a/src/libANGLE/renderer/vulkan/vk_format_map.json b/src/libANGLE/renderer/vulkan/vk_format_map.json index c08772409e..34bc9d639d 100644 --- a/src/libANGLE/renderer/vulkan/vk_format_map.json +++ b/src/libANGLE/renderer/vulkan/vk_format_map.json @@ -364,13 +364,13 @@ "buffer": "R16G16B16A16_FLOAT" }, "D32_FLOAT_S8X24_UINT": { - "image": ["D24_UNORM_S8_UINT", "D32_FLOAT_S8X24_UINT"] + "image": ["D24_UNORM_S8_UINT"] }, "D24_UNORM_S8_UINT": { - "image": ["D32_FLOAT_S8X24_UINT", "D24_UNORM_S8_UINT"] + "image": ["D32_FLOAT_S8X24_UINT"] }, "S8_UINT": { - "image": ["D24_UNORM_S8_UINT", "D32_FLOAT_S8X24_UINT", "S8_UINT"] + "image": ["D24_UNORM_S8_UINT", "D32_FLOAT_S8X24_UINT"] }, "R8_USCALED": { |