bug 14918 part 4: more cleanups (WIP)
diff --git a/tests/blit_tests.cpp b/tests/blit_tests.cpp
index 919488e..320e189 100644
--- a/tests/blit_tests.cpp
+++ b/tests/blit_tests.cpp
@@ -99,18 +99,18 @@
if (info_.usage & VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) {
if (info_.format != VK_FORMAT_S8_UINT) {
- region.imageSubresource.aspect = VK_IMAGE_ASPECT_DEPTH_BIT;
+ region.imageSubresource.aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT;
regions_.push_back(region);
}
if (info_.format == VK_FORMAT_D16_UNORM_S8_UINT ||
info_.format == VK_FORMAT_D32_SFLOAT_S8_UINT ||
info_.format == VK_FORMAT_S8_UINT) {
- region.imageSubresource.aspect = VK_IMAGE_ASPECT_STENCIL_BIT;
+ region.imageSubresource.aspectMask = VK_IMAGE_ASPECT_STENCIL_BIT;
regions_.push_back(region);
}
} else {
- region.imageSubresource.aspect = VK_IMAGE_ASPECT_COLOR_BIT;
+ region.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
regions_.push_back(region);
}
diff --git a/tests/image_tests.cpp b/tests/image_tests.cpp
index 22b1d1f..e24d60e 100644
--- a/tests/image_tests.cpp
+++ b/tests/image_tests.cpp
@@ -283,10 +283,10 @@
viewInfo.viewType = VK_IMAGE_VIEW_TYPE_2D;
viewInfo.format = fmt;
- viewInfo.channels.r = VK_COMPONENT_SWIZZLE_R;
- viewInfo.channels.g = VK_COMPONENT_SWIZZLE_G;
- viewInfo.channels.b = VK_COMPONENT_SWIZZLE_B;
- viewInfo.channels.a = VK_COMPONENT_SWIZZLE_A;
+ viewInfo.components.r = VK_COMPONENT_SWIZZLE_R;
+ viewInfo.components.g = VK_COMPONENT_SWIZZLE_G;
+ viewInfo.components.b = VK_COMPONENT_SWIZZLE_B;
+ viewInfo.components.a = VK_COMPONENT_SWIZZLE_A;
viewInfo.subresourceRange.baseArrayLayer = 0;
viewInfo.subresourceRange.layerCount = 1;
diff --git a/tests/init.cpp b/tests/init.cpp
index cb55b1a..5326380 100644
--- a/tests/init.cpp
+++ b/tests/init.cpp
@@ -235,7 +235,7 @@
memset(&query_info, 0, sizeof(query_info));
query_info.sType = VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO;
query_info.queryType = VK_QUERY_TYPE_OCCLUSION;
- query_info.slots = MAX_QUERY_SLOTS;
+ query_info.entryCount = MAX_QUERY_SLOTS;
// VkResult VKAPI vkCreateQueryPool(
// VkDevice device,
@@ -447,10 +447,10 @@
viewInfo.viewType = VK_IMAGE_VIEW_TYPE_2D;
viewInfo.format = fmt;
- viewInfo.channels.r = VK_COMPONENT_SWIZZLE_R;
- viewInfo.channels.g = VK_COMPONENT_SWIZZLE_G;
- viewInfo.channels.b = VK_COMPONENT_SWIZZLE_B;
- viewInfo.channels.a = VK_COMPONENT_SWIZZLE_A;
+ viewInfo.components.r = VK_COMPONENT_SWIZZLE_R;
+ viewInfo.components.g = VK_COMPONENT_SWIZZLE_G;
+ viewInfo.components.b = VK_COMPONENT_SWIZZLE_B;
+ viewInfo.components.a = VK_COMPONENT_SWIZZLE_A;
viewInfo.subresourceRange.baseArrayLayer = 0;
viewInfo.subresourceRange.layerCount = 1;
diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index c36c99c..f698a11 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -4931,14 +4931,14 @@
BeginCommandBuffer();
VkImageCopy copyRegion;
- copyRegion.srcSubresource.aspect = VK_IMAGE_ASPECT_COLOR_BIT;
+ copyRegion.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
copyRegion.srcSubresource.mipLevel = 0;
copyRegion.srcSubresource.baseArrayLayer = 0;
copyRegion.srcSubresource.layerCount = 0;
copyRegion.srcOffset.x = 0;
copyRegion.srcOffset.y = 0;
copyRegion.srcOffset.z = 0;
- copyRegion.dstSubresource.aspect = VK_IMAGE_ASPECT_COLOR_BIT;
+ copyRegion.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
copyRegion.dstSubresource.mipLevel = 0;
copyRegion.dstSubresource.baseArrayLayer = 0;
copyRegion.dstSubresource.layerCount = 0;
@@ -5037,14 +5037,14 @@
BeginCommandBuffer();
VkImageCopy copyRegion;
- copyRegion.srcSubresource.aspect = VK_IMAGE_ASPECT_COLOR_BIT;
+ copyRegion.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
copyRegion.srcSubresource.mipLevel = 0;
copyRegion.srcSubresource.baseArrayLayer = 0;
copyRegion.srcSubresource.layerCount = 0;
copyRegion.srcOffset.x = 0;
copyRegion.srcOffset.y = 0;
copyRegion.srcOffset.z = 0;
- copyRegion.dstSubresource.aspect = VK_IMAGE_ASPECT_COLOR_BIT;
+ copyRegion.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
copyRegion.dstSubresource.mipLevel = 0;
copyRegion.dstSubresource.baseArrayLayer = 0;
copyRegion.dstSubresource.layerCount = 0;
@@ -5141,14 +5141,14 @@
//VK_IMAGE_LAYOUT_UNDEFINED = 0,
//VK_IMAGE_LAYOUT_GENERAL = 1,
VkImageResolve resolveRegion;
- resolveRegion.srcSubresource.aspect = VK_IMAGE_ASPECT_COLOR_BIT;
+ resolveRegion.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
resolveRegion.srcSubresource.mipLevel = 0;
resolveRegion.srcSubresource.baseArrayLayer = 0;
resolveRegion.srcSubresource.layerCount = 0;
resolveRegion.srcOffset.x = 0;
resolveRegion.srcOffset.y = 0;
resolveRegion.srcOffset.z = 0;
- resolveRegion.dstSubresource.aspect = VK_IMAGE_ASPECT_COLOR_BIT;
+ resolveRegion.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
resolveRegion.dstSubresource.mipLevel = 0;
resolveRegion.dstSubresource.baseArrayLayer = 0;
resolveRegion.dstSubresource.layerCount = 0;
@@ -5247,14 +5247,14 @@
//VK_IMAGE_LAYOUT_UNDEFINED = 0,
//VK_IMAGE_LAYOUT_GENERAL = 1,
VkImageResolve resolveRegion;
- resolveRegion.srcSubresource.aspect = VK_IMAGE_ASPECT_COLOR_BIT;
+ resolveRegion.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
resolveRegion.srcSubresource.mipLevel = 0;
resolveRegion.srcSubresource.baseArrayLayer = 0;
resolveRegion.srcSubresource.layerCount = 0;
resolveRegion.srcOffset.x = 0;
resolveRegion.srcOffset.y = 0;
resolveRegion.srcOffset.z = 0;
- resolveRegion.dstSubresource.aspect = VK_IMAGE_ASPECT_COLOR_BIT;
+ resolveRegion.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
resolveRegion.dstSubresource.mipLevel = 0;
resolveRegion.dstSubresource.baseArrayLayer = 0;
resolveRegion.dstSubresource.layerCount = 0;
@@ -5355,14 +5355,14 @@
//VK_IMAGE_LAYOUT_UNDEFINED = 0,
//VK_IMAGE_LAYOUT_GENERAL = 1,
VkImageResolve resolveRegion;
- resolveRegion.srcSubresource.aspect = VK_IMAGE_ASPECT_COLOR_BIT;
+ resolveRegion.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
resolveRegion.srcSubresource.mipLevel = 0;
resolveRegion.srcSubresource.baseArrayLayer = 0;
resolveRegion.srcSubresource.layerCount = 0;
resolveRegion.srcOffset.x = 0;
resolveRegion.srcOffset.y = 0;
resolveRegion.srcOffset.z = 0;
- resolveRegion.dstSubresource.aspect = VK_IMAGE_ASPECT_COLOR_BIT;
+ resolveRegion.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
resolveRegion.dstSubresource.mipLevel = 0;
resolveRegion.dstSubresource.baseArrayLayer = 0;
resolveRegion.dstSubresource.layerCount = 0;
@@ -5462,14 +5462,14 @@
//VK_IMAGE_LAYOUT_UNDEFINED = 0,
//VK_IMAGE_LAYOUT_GENERAL = 1,
VkImageResolve resolveRegion;
- resolveRegion.srcSubresource.aspect = VK_IMAGE_ASPECT_COLOR_BIT;
+ resolveRegion.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
resolveRegion.srcSubresource.mipLevel = 0;
resolveRegion.srcSubresource.baseArrayLayer = 0;
resolveRegion.srcSubresource.layerCount = 0;
resolveRegion.srcOffset.x = 0;
resolveRegion.srcOffset.y = 0;
resolveRegion.srcOffset.z = 0;
- resolveRegion.dstSubresource.aspect = VK_IMAGE_ASPECT_COLOR_BIT;
+ resolveRegion.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
resolveRegion.dstSubresource.mipLevel = 0;
resolveRegion.dstSubresource.baseArrayLayer = 0;
resolveRegion.dstSubresource.layerCount = 0;
diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index 75e474f..5046786 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -759,13 +759,13 @@
this->SetLayout(&cmd_buf, VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
VkImageCopy copy_region = {};
- copy_region.srcSubresource.aspect = VK_IMAGE_ASPECT_COLOR_BIT;
+ copy_region.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
copy_region.srcSubresource.baseArrayLayer = 0;
copy_region.srcSubresource.mipLevel = 0;
copy_region.srcOffset.x = 0;
copy_region.srcOffset.y = 0;
copy_region.srcOffset.z = 0;
- copy_region.dstSubresource.aspect = VK_IMAGE_ASPECT_COLOR_BIT;
+ copy_region.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
copy_region.dstSubresource.baseArrayLayer = 0;
copy_region.dstSubresource.mipLevel = 0;
copy_region.dstOffset.x = 0;
@@ -815,10 +815,10 @@
view.image = VK_NULL_HANDLE;
view.viewType = VK_IMAGE_VIEW_TYPE_2D;
view.format = tex_format;
- view.channels.r = VK_COMPONENT_SWIZZLE_R;
- view.channels.g = VK_COMPONENT_SWIZZLE_G;
- view.channels.b = VK_COMPONENT_SWIZZLE_B;
- view.channels.a = VK_COMPONENT_SWIZZLE_A;
+ view.components.r = VK_COMPONENT_SWIZZLE_R;
+ view.components.g = VK_COMPONENT_SWIZZLE_G;
+ view.components.b = VK_COMPONENT_SWIZZLE_B;
+ view.components.a = VK_COMPONENT_SWIZZLE_A;
view.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
view.subresourceRange.baseMipLevel = 0;
view.subresourceRange.levelCount = 1;
diff --git a/tests/vkrenderframework.h b/tests/vkrenderframework.h
index 5382210..bc3f45c 100644
--- a/tests/vkrenderframework.h
+++ b/tests/vkrenderframework.h
@@ -313,10 +313,10 @@
createView.image = handle();
createView.viewType = VK_IMAGE_VIEW_TYPE_2D;
createView.format = format;
- createView.channels.r = VK_COMPONENT_SWIZZLE_R;
- createView.channels.g = VK_COMPONENT_SWIZZLE_G;
- createView.channels.b = VK_COMPONENT_SWIZZLE_B;
- createView.channels.a = VK_COMPONENT_SWIZZLE_A;
+ createView.components.r = VK_COMPONENT_SWIZZLE_R;
+ createView.components.g = VK_COMPONENT_SWIZZLE_G;
+ createView.components.b = VK_COMPONENT_SWIZZLE_B;
+ createView.components.a = VK_COMPONENT_SWIZZLE_A;
createView.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1};
createView.flags = 0;
m_targetView.init(*m_device, createView);
diff --git a/tests/vktestbinding.cpp b/tests/vktestbinding.cpp
index f288e67..3032a16 100644
--- a/tests/vktestbinding.cpp
+++ b/tests/vktestbinding.cpp
@@ -597,7 +597,7 @@
VkSubresourceLayout Image::subresource_layout(const VkImageSubresourceLayers &subrescopy) const
{
VkSubresourceLayout data;
- VkImageSubresource subres = subresource(image_aspect(subrescopy.aspect), subrescopy.mipLevel, subrescopy.baseArrayLayer);
+ VkImageSubresource subres = subresource(image_aspect(subrescopy.aspectMask), subrescopy.mipLevel, subrescopy.baseArrayLayer);
size_t size = sizeof(data);
vkGetImageSubresourceLayout(device(), handle(), &subres, &data);
if (size != sizeof(data))
diff --git a/tests/vktestbinding.h b/tests/vktestbinding.h
index 2af0780..cc62079 100644
--- a/tests/vktestbinding.h
+++ b/tests/vktestbinding.h
@@ -661,7 +661,7 @@
VkQueryPoolCreateInfo info = {};
info.sType = VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO;
info.queryType = type;
- info.slots = slot_count;
+ info.entryCount = slot_count;
return info;
}
@@ -695,7 +695,7 @@
inline VkImageSubresourceLayers Image::subresource(VkImageAspectFlagBits aspect, uint32_t mip_level, uint32_t array_layer, uint32_t array_size)
{
VkImageSubresourceLayers subres = {};
- subres.aspect = aspect;
+ subres.aspectMask = aspect;
subres.mipLevel = mip_level;
subres.baseArrayLayer = array_layer;
subres.layerCount = array_size;