From: Kristian Høgsberg <kristian.h.kristensen@intel.com>
Date: Tue, 12 May 2015 05:24:57 +0000 (-0700)
Subject: vk: Add 32 bpc signed and unsigned integer formats
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6a895c6681e38ecce95aa49cadc2baf2f74cfb9a;p=mesa.git

vk: Add 32 bpc signed and unsigned integer formats
---

diff --git a/src/vulkan/image.c b/src/vulkan/image.c
index b983b887e95..d416bdd1b63 100644
--- a/src/vulkan/image.c
+++ b/src/vulkan/image.c
@@ -103,17 +103,17 @@ static const struct anv_format anv_formats[] = {
    // [VK_FORMAT_R16G16B16A16_UINT] = { .format = R16G16B16A16_UINT },
    // [VK_FORMAT_R16G16B16A16_SINT] = { .format = R16G16B16A16_SINT },
    [VK_FORMAT_R16G16B16A16_SFLOAT] = { .format = R16G16B16A16_FLOAT, .cpp = 8, .channels = 4 },
-   // [VK_FORMAT_R32_UINT] = { .format = R32_UINT },
-   // [VK_FORMAT_R32_SINT] = { .format = R32_SINT },
+   [VK_FORMAT_R32_UINT] = { .format = R32_UINT, .cpp = 4, .channels = 1 },
+   [VK_FORMAT_R32_SINT] = { .format = R32_SINT, .cpp = 4, .channels = 1 },
    [VK_FORMAT_R32_SFLOAT] = { .format = R32_FLOAT, .cpp = 4, .channels = 1 },
-   // [VK_FORMAT_R32G32_UINT] = { .format = R32G32_UINT },
-   // [VK_FORMAT_R32G32_SINT] = { .format = R32G32_SINT },
+   [VK_FORMAT_R32G32_UINT] = { .format = R32G32_UINT, .cpp = 8, .channels = 2 },
+   [VK_FORMAT_R32G32_SINT] = { .format = R32G32_SINT, .cpp = 8, .channels = 2 },
    [VK_FORMAT_R32G32_SFLOAT] = { .format = R32G32_FLOAT, .cpp = 8, .channels = 2 },
-   // [VK_FORMAT_R32G32B32_UINT] = { .format = R32G32B32_UINT },
-   // [VK_FORMAT_R32G32B32_SINT] = { .format = R32G32B32_SINT },
+   [VK_FORMAT_R32G32B32_UINT] = { .format = R32G32B32_UINT, .cpp = 12, .channels = 3 },
+   [VK_FORMAT_R32G32B32_SINT] = { .format = R32G32B32_SINT, .cpp = 12, .channels = 3 },
    [VK_FORMAT_R32G32B32_SFLOAT] = { .format = R32G32B32_FLOAT, .cpp = 12, .channels = 3 },
-   // [VK_FORMAT_R32G32B32A32_UINT] = { .format = R32G32B32A32_UINT },
-   // [VK_FORMAT_R32G32B32A32_SINT] = { .format = R32G32B32A32_SINT },
+   [VK_FORMAT_R32G32B32A32_UINT] = { .format = R32G32B32A32_UINT, .cpp = 16, .channels = 4 },
+   [VK_FORMAT_R32G32B32A32_SINT] = { .format = R32G32B32A32_SINT, .cpp = 16, .channels = 4 },
    [VK_FORMAT_R32G32B32A32_SFLOAT] = { .format = R32G32B32A32_FLOAT, .cpp = 16, .channels = 4 },
    [VK_FORMAT_R64_SFLOAT] = { .format = R64_FLOAT, .cpp = 8, .channels = 1 },
    [VK_FORMAT_R64G64_SFLOAT] = { .format = R64G64_FLOAT, .cpp = 16, .channels = 2 },