lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 17:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Silently ignore VK_NULL_HANDLE passed to vkDestroy* or vkFree*

Browse Source
This commit is contained in:
baldurk
2016-05-14 11:02:46 +02:00
parent 2e6332eb6d
commit 077638d0d6
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp
+10
View File
@@ -31,6 +31,7 @@
#define DESTROY_IMPL(type, func) \
void WrappedVulkan::vk ## func(VkDevice device, type obj, const VkAllocationCallbacks* pAllocator) \
{ \
if(obj == VK_NULL_HANDLE) return; \
type unwrappedObj = Unwrap(obj); \
GetResourceManager()->ReleaseWrappedResource(obj, true); \
ObjDisp(device)->func(Unwrap(device), unwrappedObj, pAllocator); \
@@ -59,6 +60,9 @@ DESTROY_IMPL(VkRenderPass, DestroyRenderPass)
// needs to be separate because it releases internal resources
void WrappedVulkan::vkDestroySwapchainKHR(VkDevice device, VkSwapchainKHR obj, const VkAllocationCallbacks* pAllocator)
{
if(obj == VK_NULL_HANDLE)
return;
// release internal rendering objects we created for rendering the overlay
{
SwapchainInfo &info = *GetRecord(obj)->swapInfo;
@@ -90,6 +94,9 @@ void WrappedVulkan::vkDestroySwapchainKHR(VkDevice device, VkSwapchainKHR obj, c
// needs to be separate so we don't erase from m_ImageLayouts in other destroy functions
void WrappedVulkan::vkDestroyImage(VkDevice device, VkImage obj, const VkAllocationCallbacks* pAllocator)
{
if(obj == VK_NULL_HANDLE)
return;
{
SCOPED_LOCK(m_ImageLayoutsLock);
m_ImageLayouts.erase(GetResID(obj));
@@ -104,6 +111,9 @@ void WrappedVulkan::vkFreeCommandBuffers(VkDevice device, VkCommandPool commandP
{
for(uint32_t c=0; c < commandBufferCount; c++)
{
if(pCommandBuffers[c] == VK_NULL_HANDLE)
continue;
WrappedVkDispRes *wrapped = (WrappedVkDispRes *)GetWrapped(pCommandBuffers[c]);
VkCommandBuffer unwrapped = wrapped->real.As<VkCommandBuffer>();
renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp
+3
View File
@@ -327,6 +327,9 @@ void WrappedVulkan::vkFreeMemory(
VkDeviceMemory memory,
const VkAllocationCallbacks* pAllocator)
{
if(memory == VK_NULL_HANDLE)
return;
// we just need to clean up after ourselves on replay
WrappedVkNonDispRes *wrapped = (WrappedVkNonDispRes *)GetWrapped(memory);