Fix some debug validation layer errors

This commit is contained in:
baldurk
2015-11-13 17:50:38 +01:00
parent b09bc089ef
commit c1f87201bb
2 changed files with 6 additions and 5 deletions
+2 -2
View File
@@ -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,
};
+4 -3
View File
@@ -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, &region);
@@ -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 },
};