From c1f87201bb6261e8f4b4d2b5da068688ff4ab45a Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 13 Nov 2015 17:50:38 +0100 Subject: [PATCH] Fix some debug validation layer errors --- renderdoc/driver/vulkan/vk_debug.cpp | 4 ++-- renderdoc/driver/vulkan/vk_replay.cpp | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/renderdoc/driver/vulkan/vk_debug.cpp b/renderdoc/driver/vulkan/vk_debug.cpp index 920f02e72..85de1ca87 100644 --- a/renderdoc/driver/vulkan/vk_debug.cpp +++ b/renderdoc/driver/vulkan/vk_debug.cpp @@ -825,7 +825,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) Unwrap(m_TextAtlas), VK_IMAGE_VIEW_TYPE_2D, imInfo.format, { VK_CHANNEL_SWIZZLE_R, VK_CHANNEL_SWIZZLE_G, VK_CHANNEL_SWIZZLE_B, VK_CHANNEL_SWIZZLE_A }, - { VK_IMAGE_ASPECT_COLOR, 0, 1, 0, 1, }, + { VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1, }, 0, }; @@ -934,7 +934,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) Unwrap(m_PickPixelImage), VK_IMAGE_VIEW_TYPE_2D, VK_FORMAT_R32G32B32A32_SFLOAT, { VK_CHANNEL_SWIZZLE_R, VK_CHANNEL_SWIZZLE_G, VK_CHANNEL_SWIZZLE_B, VK_CHANNEL_SWIZZLE_A }, - { VK_IMAGE_ASPECT_COLOR, 0, 1, 0, 1, }, + { VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1, }, 0, }; diff --git a/renderdoc/driver/vulkan/vk_replay.cpp b/renderdoc/driver/vulkan/vk_replay.cpp index 3c47a9ecb..6a255a930 100644 --- a/renderdoc/driver/vulkan/vk_replay.cpp +++ b/renderdoc/driver/vulkan/vk_replay.cpp @@ -825,7 +825,8 @@ void VulkanReplay::PickPixel(ResourceId texture, uint32_t x, uint32_t y, uint32_ // do copy VkBufferImageCopy region = { 0, 128, 1, - { VK_IMAGE_ASPECT_COLOR, 0, 0}, { 0, 0, 0 }, + { VK_IMAGE_ASPECT_COLOR, 0, 0, 1 }, + { 0, 0, 0 }, { 1, 1, 1 }, }; vt->CmdCopyImageToBuffer(Unwrap(cmd), Unwrap(GetDebugManager()->m_PickPixelImage), VK_IMAGE_LAYOUT_TRANSFER_SOURCE_OPTIMAL, Unwrap(GetDebugManager()->m_PickPixelReadbackBuffer.buf), 1, ®ion); @@ -1390,9 +1391,9 @@ void VulkanReplay::FlipOutputWindow(uint64_t id) outw.bbtrans.inputMask = 0; VkImageCopy cpy = { - { VK_IMAGE_ASPECT_COLOR, 0, 0 }, + { VK_IMAGE_ASPECT_COLOR, 0, 0, 1 }, { 0, 0, 0 }, - { VK_IMAGE_ASPECT_COLOR, 0, 0 }, + { VK_IMAGE_ASPECT_COLOR, 0, 0, 1 }, { 0, 0, 0 }, { outw.width, outw.height, 1 }, };