Mesa (master): util/format: add missing BC4/BC5 vulkan formats

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 89c6ef4233583469f30b266fcec8486f5d7d2b5a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=89c6ef4233583469f30b266fcec8486f5d7d2b5a

Author: Jonathan Marek <jonathan at marek.ca>
Date:   Wed Feb 12 18:45:28 2020 -0500

util/format: add missing BC4/BC5 vulkan formats

Enables these formats for turnip.

Signed-off-by: Jonathan Marek <jonathan at marek.ca>
Reviewed-by: Eric Anholt <eric at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3806>

---

 src/vulkan/util/vk_format.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vulkan/util/vk_format.c b/src/vulkan/util/vk_format.c
index 4fdfb6d5a62..f23575958b3 100644
--- a/src/vulkan/util/vk_format.c
+++ b/src/vulkan/util/vk_format.c
@@ -183,6 +183,10 @@ static const enum pipe_format vk_format_map[] = {
    [VK_FORMAT_BC2_SRGB_BLOCK] = PIPE_FORMAT_DXT3_SRGBA,
    [VK_FORMAT_BC3_UNORM_BLOCK] = PIPE_FORMAT_DXT5_RGBA,
    [VK_FORMAT_BC3_SRGB_BLOCK] = PIPE_FORMAT_DXT5_SRGBA,
+   [VK_FORMAT_BC4_UNORM_BLOCK] = PIPE_FORMAT_RGTC1_UNORM,
+   [VK_FORMAT_BC4_SNORM_BLOCK] = PIPE_FORMAT_RGTC1_SNORM,
+   [VK_FORMAT_BC5_UNORM_BLOCK] = PIPE_FORMAT_RGTC2_UNORM,
+   [VK_FORMAT_BC5_SNORM_BLOCK] = PIPE_FORMAT_RGTC2_SNORM,
    [VK_FORMAT_BC6H_UFLOAT_BLOCK] = PIPE_FORMAT_BPTC_RGB_UFLOAT,
    [VK_FORMAT_BC6H_SFLOAT_BLOCK] = PIPE_FORMAT_BPTC_RGB_FLOAT,
    [VK_FORMAT_BC7_UNORM_BLOCK] = PIPE_FORMAT_BPTC_RGBA_UNORM,