bug 14516: rename VK_IMAGE_USAGE_DEPTH_STENCIL_BIT
into VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT
diff --git a/include/vulkan.h b/include/vulkan.h
index 67b5241..e034f6b 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -41,7 +41,7 @@
((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 @@
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 d1284d8..bff038c 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -1052,7 +1052,7 @@
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 @@
// 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 246b157..338401d 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -396,7 +396,7 @@
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 @@
{
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)
{
diff --git a/tests/blit_tests.cpp b/tests/blit_tests.cpp
index c486b2c..6c509b8 100644
--- a/tests/blit_tests.cpp
+++ b/tests/blit_tests.cpp
@@ -97,7 +97,7 @@
region.imageSubresource.arraySlice = 0;
region.imageExtent = Image::extent(info_.extent, lv);
- if (info_.usage & VK_IMAGE_USAGE_DEPTH_STENCIL_BIT) {
+ if (info_.usage & VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) {
if (info_.format != VK_FORMAT_S8_UINT) {
region.imageSubresource.aspect = VK_IMAGE_ASPECT_DEPTH;
regions_.push_back(region);
@@ -1473,7 +1473,7 @@
img_info.extent.width = 64;
img_info.extent.height = 64;
img_info.tiling = it->tiling;
- img_info.usage = VK_IMAGE_USAGE_DEPTH_STENCIL_BIT;
+ img_info.usage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
const VkImageSubresourceRange range =
vk_testing::Image::subresource_range(img_info, VK_IMAGE_ASPECT_DEPTH);
diff --git a/tests/image_tests.cpp b/tests/image_tests.cpp
index 4e4862c..51ec509 100644
--- a/tests/image_tests.cpp
+++ b/tests/image_tests.cpp
@@ -191,7 +191,7 @@
}
// Image usage flags
- // VK_IMAGE_USAGE_DEPTH_STENCIL_BIT = 0x00000008,
+ // VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT = 0x00000008,
//typedef enum VkImageUsageFlags_
//{
// VK_IMAGE_USAGE_TRANSFER_SOURCE_BIT = 0x00000001, // Can be used as a source of transfer operations
@@ -199,7 +199,7 @@
// VK_IMAGE_USAGE_SAMPLED_BIT = 0x00000004, // Can be sampled from (SAMPLED_IMAGE and COMBINED_IMAGE_SAMPLER descriptor types)
// VK_IMAGE_USAGE_STORAGE_BIT = 0x00000008, // Can be used as storage image (STORAGE_IMAGE descriptor type)
// VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT = 0x00000010, // Can be used as framebuffer color attachment
- // VK_IMAGE_USAGE_DEPTH_STENCIL_BIT = 0x00000020, // Can be used as framebuffer depth/stencil attachment
+ // VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT = 0x00000020, // Can be used as framebuffer depth/stencil attachment
// VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT = 0x00000040, // Image data not needed outside of rendering
// } VkImageUsageFlags;
imageCreateInfo.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT |
diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 4d78f0d..b43eeaa 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -880,7 +880,7 @@
.arraySize = 1,
.samples = 1,
.tiling = VK_IMAGE_TILING_LINEAR,
- .usage = 0, // Not setting VK_IMAGE_USAGE_DEPTH_STENCIL_BIT
+ .usage = 0, // Not setting VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT
.flags = 0,
};
diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index ff7f0c1..9a83141 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -1604,7 +1604,7 @@
image_info.arraySize = 1;
image_info.samples = 1;
image_info.tiling = VK_IMAGE_TILING_OPTIMAL;
- image_info.usage = VK_IMAGE_USAGE_DEPTH_STENCIL_BIT;
+ image_info.usage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
image_info.flags = 0;
image_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
image_info.queueFamilyCount = 0;
diff --git a/tests/vktestbinding.cpp b/tests/vktestbinding.cpp
index 867ae18..d0bf72e 100644
--- a/tests/vktestbinding.cpp
+++ b/tests/vktestbinding.cpp
@@ -608,7 +608,7 @@
return (create_info_.tiling == VK_IMAGE_TILING_LINEAR &&
create_info_.samples == 1 &&
!(create_info_.usage & (VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT |
- VK_IMAGE_USAGE_DEPTH_STENCIL_BIT)));
+ VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT)));
}
NON_DISPATCHABLE_HANDLE_DTOR(ImageView, vkDestroyImageView)