vulkan: Consistent naming scheme for resources in XGL
Bug 13230
header: 0.78.0
includes review feedback.
v2: replace VK_FORMAT_IMAGE_COPY_BIT by VK_FORMAT_COLOR_ATTACHMENT_BIT for now
(olv)
diff --git a/tests/image_tests.cpp b/tests/image_tests.cpp
index 57d0418..ee4e55e 100644
--- a/tests/image_tests.cpp
+++ b/tests/image_tests.cpp
@@ -178,10 +178,10 @@
imageCreateInfo.extent.depth = 1;
imageCreateInfo.mipLevels = mipCount;
imageCreateInfo.samples = 1;
- if (image_fmt.linearTilingFeatures & VK_FORMAT_IMAGE_SHADER_READ_BIT) {
+ if (image_fmt.linearTilingFeatures & VK_FORMAT_SAMPLED_IMAGE_BIT) {
imageCreateInfo.tiling = VK_LINEAR_TILING;
}
- else if (image_fmt.optimalTilingFeatures & VK_FORMAT_IMAGE_SHADER_READ_BIT) {
+ else if (image_fmt.optimalTilingFeatures & VK_FORMAT_SAMPLED_IMAGE_BIT) {
imageCreateInfo.tiling = VK_OPTIMAL_TILING;
}
else {
@@ -189,14 +189,19 @@
}
// Image usage flags
- // typedef enum VkImageUsageFlags_
- // {
- // VK_IMAGE_USAGE_SHADER_ACCESS_READ_BIT = 0x00000001,
- // VK_IMAGE_USAGE_SHADER_ACCESS_WRITE_BIT = 0x00000002,
- // VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT = 0x00000004,
// VK_IMAGE_USAGE_DEPTH_STENCIL_BIT = 0x00000008,
+ //typedef enum VkImageUsageFlags_
+ //{
+ // VK_IMAGE_USAGE_GENERAL = 0x00000000, // no special usage
+ // VK_IMAGE_USAGE_TRANSFER_SOURCE_BIT = 0x00000001, // Can be used as a source of transfer operations
+ // VK_IMAGE_USAGE_TRANSFER_DESTINATION_BIT = 0x00000002, // Can be used as a destination of transfer operations
+ // 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_TRANSIENT_ATTACHMENT_BIT = 0x00000040, // Image data not needed outside of rendering
// } VkImageUsageFlags;
- imageCreateInfo.usage = VK_IMAGE_USAGE_SHADER_ACCESS_WRITE_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
+ imageCreateInfo.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
// VkResult VKAPI vkCreateImage(
// VkDevice device,