Revert "[vk] Ensure image view flags are resolved"
This commit is contained in:
parent
bc70f1b32d
commit
e6ec42ee9d
|
|
@ -2051,21 +2051,15 @@ ImageView::ImageView(TextureCacheRuntime& runtime, const VideoCommon::ImageViewI
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const auto format_info = MaxwellToVK::SurfaceFormat(*device, FormatType::Optimal, true, format);
|
const auto format_info = MaxwellToVK::SurfaceFormat(*device, FormatType::Optimal, true, format);
|
||||||
const VkImageUsageFlags desired_usage = ImageUsageFlags(format_info, format);
|
if (ImageUsageFlags(format_info, format) != image.UsageFlags()) {
|
||||||
const VkImageUsageFlags image_usage = image.UsageFlags();
|
LOG_WARNING(Render_Vulkan,
|
||||||
|
"Image view format {} has different usage flags than image format {}", format,
|
||||||
// ImageView usage must be a subset of the original image usage
|
image.info.format);
|
||||||
const VkImageUsageFlags view_usage = desired_usage & image_usage;
|
|
||||||
|
|
||||||
if (desired_usage != image_usage) {
|
|
||||||
LOG_DEBUG(Render_Vulkan,
|
|
||||||
"Image view format {} usage flags (0x{:X}) restricted to image usage (0x{:X}), result: 0x{:X}",
|
|
||||||
format, desired_usage, image_usage, view_usage);
|
|
||||||
}
|
}
|
||||||
const VkImageViewUsageCreateInfo image_view_usage{
|
const VkImageViewUsageCreateInfo image_view_usage{
|
||||||
.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO,
|
.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO,
|
||||||
.pNext = nullptr,
|
.pNext = nullptr,
|
||||||
.usage = view_usage,
|
.usage = ImageUsageFlags(format_info, format),
|
||||||
};
|
};
|
||||||
const VkImageViewCreateInfo create_info{
|
const VkImageViewCreateInfo create_info{
|
||||||
.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
|
.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue