Vulkan: Fix ASTC_12x12_SRGB_BLOCK support

A typo in the .json file made this format unavailable. Bug: angleproject:2357 Change-Id: I3214c6d8a00d9fa731573347b06bded8fb57a918 Reviewed-on: https://chromium-review.googlesource.com/c/1359619 Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Vulkan: Fix ASTC_12x12_SRGB_BLOCK support
eae081c6 · Shahbaz Youssefi · Commit Bot · 96bd8fdf · eae081c6 · eae081c6
Commit eae081c6 authored Dec 03, 2018 by Shahbaz Youssefi Committed by Commit Bot Dec 05, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

vk_format_map.json src/libANGLE/renderer/vulkan/vk_format_map.json +1 -1

vk_format_table_autogen.cpp src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp +9 -1

No files found.
--- a/src/libANGLE/renderer/vulkan/vk_format_map.json
+++ b/src/libANGLE/renderer/vulkan/vk_format_map.json
@@ -199,7 +199,7 @@
        "ASTC_12x10_UNORM_BLOCK": "VK_FORMAT_ASTC_12x10_UNORM_BLOCK",
        "ASTC_12x10_SRGB_BLOCK": "VK_FORMAT_ASTC_12x10_SRGB_BLOCK",
        "ASTC_12x12_UNORM_BLOCK": "VK_FORMAT_ASTC_12x12_UNORM_BLOCK",
-        "ASTC_12x12_SRGB_BLOC": "VK_FORMAT_ASTC_12x12_SRGB_BLOCK"
+        "ASTC_12x12_SRGB_BLOCK": "VK_FORMAT_ASTC_12x12_SRGB_BLOCK"
    },
    "overrides": {
        "A8_UNORM": {

--- a/src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp
@@ -175,7 +175,15 @@ void Format::initialize(RendererVk *renderer, const angle::Format &angleFormat)
            break;
        case angle::FormatID::ASTC_12x12_SRGB_BLOCK:
-            // This format is not implemented in Vulkan.
+            internalFormat               = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR;
+            textureFormatID              = angle::FormatID::ASTC_12x12_SRGB_BLOCK;
+            vkTextureFormat              = VK_FORMAT_ASTC_12x12_SRGB_BLOCK;
+            textureInitializerFunction   = nullptr;
+            bufferFormatID               = angle::FormatID::ASTC_12x12_SRGB_BLOCK;
+            vkBufferFormat               = VK_FORMAT_ASTC_12x12_SRGB_BLOCK;
+            vkBufferFormatIsPacked       = false;
+            vertexLoadFunction           = nullptr;
+            vertexLoadRequiresConversion = false;
            break;
        case angle::FormatID::ASTC_12x12_UNORM_BLOCK: