diff options
| author | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-09-10 14:14:11 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-09-11 09:20:02 -0600 |
| commit | 4e368eec5a90de72c014e451712d6530a844dff7 (patch) | |
| tree | a69a2cf622a1aa4141218768715e5d61284c07da | |
| parent | 781da8a6b3d52c789537f35d131a04ba03ba2e65 (diff) | |
| download | usermoji-4e368eec5a90de72c014e451712d6530a844dff7.tar.xz | |
bug 14516: rename VK_IMAGE_USAGE_DEPTH_STENCIL_BIT
into VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT
| -rw-r--r-- | demos/cube.c | 2 | ||||
| -rw-r--r-- | demos/tri.c | 2 | ||||
| -rw-r--r-- | include/vulkan.h | 4 | ||||
| -rw-r--r-- | layers/mem_tracker.cpp | 4 | ||||
| -rw-r--r-- | layers/param_checker.cpp | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/demos/cube.c b/demos/cube.c index 292b7a84..0404f482 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -826,7 +826,7 @@ static void demo_prepare_depth(struct demo *demo) .arraySize = 1, .samples = 1, .tiling = VK_IMAGE_TILING_OPTIMAL, - .usage = VK_IMAGE_USAGE_DEPTH_STENCIL_BIT, + .usage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT, .flags = 0, }; VkMemoryAllocInfo mem_alloc = { diff --git a/demos/tri.c b/demos/tri.c index 63bd2741..76f959c1 100644 --- a/demos/tri.c +++ b/demos/tri.c @@ -632,7 +632,7 @@ static void demo_prepare_depth(struct demo *demo) .arraySize = 1, .samples = 1, .tiling = VK_IMAGE_TILING_OPTIMAL, - .usage = VK_IMAGE_USAGE_DEPTH_STENCIL_BIT, + .usage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT, .flags = 0, }; VkMemoryAllocInfo mem_alloc = { diff --git a/include/vulkan.h b/include/vulkan.h index 67b52412..e034f6b0 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -41,7 +41,7 @@ extern "C" { ((major << 22) | (minor << 12) | patch) // Vulkan API version supported by this file -#define VK_API_VERSION VK_MAKE_VERSION(0, 162, 0) +#define VK_API_VERSION VK_MAKE_VERSION(0, 164, 0) #if defined(__cplusplus) && (_MSC_VER >= 1800 || __cplusplus >= 201103L) @@ -858,7 +858,7 @@ typedef enum { VK_IMAGE_USAGE_SAMPLED_BIT = 0x00000004, VK_IMAGE_USAGE_STORAGE_BIT = 0x00000008, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT = 0x00000010, - VK_IMAGE_USAGE_DEPTH_STENCIL_BIT = 0x00000020, + VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT = 0x00000020, VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT = 0x00000040, VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT = 0x00000080, } VkImageUsageFlagBits; diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp index d1284d87..bff038c4 100644 --- a/layers/mem_tracker.cpp +++ b/layers/mem_tracker.cpp @@ -1052,7 +1052,7 @@ static VkBool32 set_mem_binding( if (VK_OBJECT_TYPE_IMAGE == type) { VkImageCreateInfo ici = pObjBindInfo->create_info.image; if (ici.usage & (VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | - VK_IMAGE_USAGE_DEPTH_STENCIL_BIT)) { + VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT)) { // TODO:: More memory state transition stuff. } } @@ -2195,7 +2195,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateImageView( // Validate that img has correct usage flags set validate_image_usage_flags( device, pCreateInfo->image, - VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_STORAGE_BIT | VK_IMAGE_USAGE_DEPTH_STENCIL_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, + VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_STORAGE_BIT | VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, false, "vkCreateImageView()", "VK_IMAGE_USAGE_[SAMPLED|STORAGE|COLOR_ATTACHMENT]_BIT"); loader_platform_thread_unlock_mutex(&globalLock); } diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index 246b1573..338401d2 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -396,7 +396,7 @@ static bool ValidateEnumerator(VkImageUsageFlagBits const& enumerator) { VkImageUsageFlagBits allFlags = (VkImageUsageFlagBits)(VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT | - VK_IMAGE_USAGE_DEPTH_STENCIL_BIT | + VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_STORAGE_BIT | VK_IMAGE_USAGE_SAMPLED_BIT | @@ -424,9 +424,9 @@ std::string EnumeratorString(VkImageUsageFlagBits const& enumerator) { strings.push_back("VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT"); } - if(enumerator & VK_IMAGE_USAGE_DEPTH_STENCIL_BIT) + if(enumerator & VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) { - strings.push_back("VK_IMAGE_USAGE_DEPTH_STENCIL_BIT"); + strings.push_back("VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT"); } if(enumerator & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT) { |