Commit eae081c6 by Shahbaz Youssefi Committed by Commit Bot

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: 's avatarJamie Madill <jmadill@chromium.org>
parent 96bd8fdf
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
"ASTC_12x10_UNORM_BLOCK": "VK_FORMAT_ASTC_12x10_UNORM_BLOCK", "ASTC_12x10_UNORM_BLOCK": "VK_FORMAT_ASTC_12x10_UNORM_BLOCK",
"ASTC_12x10_SRGB_BLOCK": "VK_FORMAT_ASTC_12x10_SRGB_BLOCK", "ASTC_12x10_SRGB_BLOCK": "VK_FORMAT_ASTC_12x10_SRGB_BLOCK",
"ASTC_12x12_UNORM_BLOCK": "VK_FORMAT_ASTC_12x12_UNORM_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": { "overrides": {
"A8_UNORM": { "A8_UNORM": {
......
...@@ -175,7 +175,15 @@ void Format::initialize(RendererVk *renderer, const angle::Format &angleFormat) ...@@ -175,7 +175,15 @@ void Format::initialize(RendererVk *renderer, const angle::Format &angleFormat)
break; break;
case angle::FormatID::ASTC_12x12_SRGB_BLOCK: 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; break;
case angle::FormatID::ASTC_12x12_UNORM_BLOCK: case angle::FormatID::ASTC_12x12_UNORM_BLOCK:
......
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