lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-23 06:56:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Declare images as VK_SHARING_MODE_CONCURRENT

Browse Source 
* Necessary for now since the code doesn't acquire ownership
This commit is contained in:
baldurk
2016-03-07 23:08:06 +01:00
parent 93b8d7e5c2
commit 7f73ecc02a
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_core.cpp
+1 -1
View File
@@ -858,7 +858,7 @@ bool WrappedVulkan::EndFrameCapture(void *dev, void *wnd)
{ swapInfo.extent.width, swapInfo.extent.height, 1 }, 1, 1,
VK_SAMPLE_COUNT_1_BIT,
VK_IMAGE_TILING_LINEAR, VK_IMAGE_USAGE_TRANSFER_DST_BIT,
VK_SHARING_MODE_EXCLUSIVE, 0, NULL,
VK_SHARING_MODE_CONCURRENT, 0, NULL,
VK_IMAGE_LAYOUT_UNDEFINED,
};
vt->CreateImage(Unwrap(dev), &imInfo, NULL, &readbackIm);
renderdoc/driver/vulkan/vk_debug.cpp
+4 -4
View File
@@ -1140,7 +1140,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev)
{ width, height, 1 }, 1, 1, VK_SAMPLE_COUNT_1_BIT,
VK_IMAGE_TILING_OPTIMAL,
VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT,
VK_SHARING_MODE_EXCLUSIVE,
VK_SHARING_MODE_CONCURRENT,
0, NULL,
VK_IMAGE_LAYOUT_UNDEFINED,
};
@@ -1306,7 +1306,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev)
{ 1, 1, 1 }, 1, 1, VK_SAMPLE_COUNT_1_BIT,
VK_IMAGE_TILING_OPTIMAL,
VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT|VK_IMAGE_USAGE_TRANSFER_SRC_BIT,
VK_SHARING_MODE_EXCLUSIVE,
VK_SHARING_MODE_CONCURRENT,
0, NULL,
VK_IMAGE_LAYOUT_UNDEFINED,
};
@@ -2555,7 +2555,7 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve
1, 1, VK_SAMPLE_COUNT_1_BIT,
VK_IMAGE_TILING_OPTIMAL,
VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT|VK_IMAGE_USAGE_SAMPLED_BIT|VK_IMAGE_USAGE_TRANSFER_SRC_BIT,
VK_SHARING_MODE_EXCLUSIVE,
VK_SHARING_MODE_CONCURRENT,
0, NULL,
VK_IMAGE_LAYOUT_UNDEFINED,
};
@@ -3561,7 +3561,7 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve
1, 4, VK_SAMPLE_COUNT_1_BIT,
VK_IMAGE_TILING_OPTIMAL,
VK_IMAGE_USAGE_TRANSFER_DST_BIT|VK_IMAGE_USAGE_STORAGE_BIT|VK_IMAGE_USAGE_SAMPLED_BIT,
VK_SHARING_MODE_EXCLUSIVE, 0, NULL,
VK_SHARING_MODE_CONCURRENT, 0, NULL,
VK_IMAGE_LAYOUT_UNDEFINED,
};
renderdoc/driver/vulkan/vk_initstate.cpp
+2 -2
View File
@@ -459,7 +459,7 @@ bool WrappedVulkan::Serialise_SparseBufferInitialState(ResourceId id, VulkanReso
VkBufferCreateInfo bufInfo = {
VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO, NULL, 0,
info->totalSize, VK_BUFFER_USAGE_TRANSFER_SRC_BIT|VK_BUFFER_USAGE_TRANSFER_DST_BIT,
VK_SHARING_MODE_EXCLUSIVE, 0, NULL,
VK_SHARING_MODE_CONCURRENT, 0, NULL,
};
VkBuffer buf;
@@ -1496,7 +1496,7 @@ bool WrappedVulkan::Serialise_InitialState(ResourceId resid, WrappedVkRes *)
m_CreationInfo.m_Image[liveim->id].samples,
VK_IMAGE_TILING_OPTIMAL, // make this optimal since the format/etc is more likely supported as optimal
VK_IMAGE_USAGE_TRANSFER_SRC_BIT|VK_IMAGE_USAGE_TRANSFER_DST_BIT,
VK_SHARING_MODE_EXCLUSIVE,
VK_SHARING_MODE_CONCURRENT,
0,
NULL,
VK_IMAGE_LAYOUT_UNDEFINED,
renderdoc/driver/vulkan/vk_replay.cpp
+4 -4
View File
@@ -282,7 +282,7 @@ void VulkanReplay::OutputWindow::Create(WrappedVulkan *driver, VkDevice device,
0, Unwrap(surface),
2, imformat, imcolspace, { width, height }, 1,
VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT,
VK_SHARING_MODE_EXCLUSIVE, 0, NULL,
VK_SHARING_MODE_CONCURRENT, 0, NULL,
VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR, VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR,
presentmode, true,
Unwrap(old),
@@ -325,7 +325,7 @@ void VulkanReplay::OutputWindow::Create(WrappedVulkan *driver, VkDevice device,
1, 1, VULKAN_MESH_VIEW_SAMPLES,
VK_IMAGE_TILING_OPTIMAL,
VK_IMAGE_USAGE_TRANSFER_DST_BIT|VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT,
VK_SHARING_MODE_EXCLUSIVE, 0, NULL,
VK_SHARING_MODE_CONCURRENT, 0, NULL,
VK_IMAGE_LAYOUT_UNDEFINED,
};
@@ -429,7 +429,7 @@ void VulkanReplay::OutputWindow::Create(WrappedVulkan *driver, VkDevice device,
1, 1, depth ? VULKAN_MESH_VIEW_SAMPLES : VK_SAMPLE_COUNT_1_BIT,
VK_IMAGE_TILING_OPTIMAL,
VK_IMAGE_USAGE_TRANSFER_DST_BIT|VK_IMAGE_USAGE_TRANSFER_SRC_BIT|VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
VK_SHARING_MODE_EXCLUSIVE, 0, NULL,
VK_SHARING_MODE_CONCURRENT, 0, NULL,
VK_IMAGE_LAYOUT_UNDEFINED,
};
@@ -4002,7 +4002,7 @@ byte *VulkanReplay::GetTextureData(ResourceId tex, uint32_t arrayIdx, uint32_t m
(uint32_t)imInfo.mipLevels, (uint32_t)imInfo.arrayLayers, imInfo.samples,
VK_IMAGE_TILING_OPTIMAL,
VK_IMAGE_USAGE_TRANSFER_SRC_BIT|VK_IMAGE_USAGE_TRANSFER_DST_BIT,
VK_SHARING_MODE_EXCLUSIVE, 0, NULL,
VK_SHARING_MODE_CONCURRENT, 0, NULL,
VK_IMAGE_LAYOUT_UNDEFINED,
};
renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp
+1 -1
View File
@@ -214,7 +214,7 @@ bool WrappedVulkan::Serialise_vkCreateSwapchainKHR(
VK_IMAGE_USAGE_TRANSFER_DST_BIT|
VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT|
VK_IMAGE_USAGE_SAMPLED_BIT,
VK_SHARING_MODE_EXCLUSIVE, 0, NULL,
VK_SHARING_MODE_CONCURRENT, 0, NULL,
VK_IMAGE_LAYOUT_UNDEFINED,
};