diff options
| author | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-09-10 17:17:43 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-09-11 09:24:00 -0600 |
| commit | 74880947328ff5fbddb3bab1f12004434a459cf4 (patch) | |
| tree | b13584a8a812ebe7f4d2400b8100b42be575308e | |
| parent | 04c33f7993c84fe160a6e046152c32290ad7c9aa (diff) | |
| download | usermoji-74880947328ff5fbddb3bab1f12004434a459cf4.tar.xz | |
Bug 12998: Document required depth formats and layouts in buffer memory
| -rw-r--r-- | demos/vulkaninfo.c | 2 | ||||
| -rw-r--r-- | icd/common/icd-format.c | 4 | ||||
| -rw-r--r-- | include/vulkan.h | 2 | ||||
| -rw-r--r-- | layers/image.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c index e3586627..f5605338 100644 --- a/demos/vulkaninfo.c +++ b/demos/vulkaninfo.c @@ -259,7 +259,7 @@ static const char *vk_format_string(VkFormat fmt) STR(R11G11B10_UFLOAT); STR(R9G9B9E5_UFLOAT); STR(D16_UNORM); - STR(D24_UNORM); + STR(D24_UNORM_X8); STR(D32_SFLOAT); STR(S8_UINT); STR(D16_UNORM_S8_UINT); diff --git a/icd/common/icd-format.c b/icd/common/icd-format.c index 2834a23a..893eb27f 100644 --- a/icd/common/icd-format.c +++ b/icd/common/icd-format.c @@ -123,7 +123,7 @@ static const struct icd_format_info { [VK_FORMAT_R11G11B10_UFLOAT] = { 4, 3 }, [VK_FORMAT_R9G9B9E5_UFLOAT] = { 4, 3 }, [VK_FORMAT_D16_UNORM] = { 2, 1 }, - [VK_FORMAT_D24_UNORM] = { 3, 1 }, + [VK_FORMAT_D24_UNORM_X8] = { 3, 1 }, [VK_FORMAT_D32_SFLOAT] = { 4, 1 }, [VK_FORMAT_S8_UINT] = { 1, 1 }, [VK_FORMAT_D16_UNORM_S8_UINT] = { 3, 2 }, @@ -211,7 +211,7 @@ bool icd_format_is_ds(VkFormat format) switch (format) { case VK_FORMAT_D16_UNORM: - case VK_FORMAT_D24_UNORM: + case VK_FORMAT_D24_UNORM_X8: case VK_FORMAT_D32_SFLOAT: case VK_FORMAT_S8_UINT: case VK_FORMAT_D16_UNORM_S8_UINT: diff --git a/include/vulkan.h b/include/vulkan.h index 7389d392..cd635044 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -328,7 +328,7 @@ typedef enum { VK_FORMAT_R11G11B10_UFLOAT = 87, VK_FORMAT_R9G9B9E5_UFLOAT = 88, VK_FORMAT_D16_UNORM = 89, - VK_FORMAT_D24_UNORM = 90, + VK_FORMAT_D24_UNORM_X8 = 90, VK_FORMAT_D32_SFLOAT = 91, VK_FORMAT_S8_UINT = 92, VK_FORMAT_D16_UNORM_S8_UINT = 93, diff --git a/layers/image.cpp b/layers/image.cpp index de157897..7fc5f7c8 100644 --- a/layers/image.cpp +++ b/layers/image.cpp @@ -250,7 +250,7 @@ bool is_depth_format(VkFormat format) bool result = VK_FALSE; switch (format) { case VK_FORMAT_D16_UNORM: - case VK_FORMAT_D24_UNORM: + case VK_FORMAT_D24_UNORM_X8: case VK_FORMAT_D32_SFLOAT: case VK_FORMAT_S8_UINT: case VK_FORMAT_D16_UNORM_S8_UINT: |