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

Revert "fixed in app api capture"

Browse Source 
This reverts commit 98b623cfcc.
This commit is contained in:
baldurk
2019-09-02 14:01:52 +01:00
parent 2d0b18b18b
commit 8246c01198
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_core.cpp
+1 -1
View File
@@ -1337,7 +1337,7 @@ void WrappedVulkan::FirstFrame()
// if we have to capture the first frame, begin capturing immediately
if(IsBackgroundCapturing(m_State) && RenderDoc::Inst().ShouldTriggerCapture(0))
{
RenderDoc::Inst().StartFrameCapture(m_Instance, NULL);
RenderDoc::Inst().StartFrameCapture(LayerDisp(m_Instance), NULL);
m_AppControlledCapture = false;
}
renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp
+2 -2
View File
@@ -715,7 +715,7 @@ VkResult WrappedVulkan::vkCreateInstance(const VkInstanceCreateInfo *pCreateInfo
InitInstanceExtensionTables(m_Instance, record->instDevInfo);
RenderDoc::Inst().AddDeviceFrameCapturer(m_Instance, this);
RenderDoc::Inst().AddDeviceFrameCapturer(LayerDisp(m_Instance), this);
m_DbgReportCallback = VK_NULL_HANDLE;
m_DbgUtilsCallback = VK_NULL_HANDLE;
@@ -881,7 +881,7 @@ void WrappedVulkan::vkDestroyInstance(VkInstance instance, const VkAllocationCal
// application is well behaved. If not, we just leak.
ObjDisp(m_Instance)->DestroyInstance(Unwrap(m_Instance), NULL);
RenderDoc::Inst().RemoveDeviceFrameCapturer(m_Instance);
RenderDoc::Inst().RemoveDeviceFrameCapturer(LayerDisp(m_Instance));
GetResourceManager()->ReleaseWrappedResource(m_Instance);
m_Instance = VK_NULL_HANDLE;
renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp
+1 -1
View File
@@ -138,7 +138,7 @@ void WrappedVulkan::vkDestroySwapchainKHR(VkDevice device, VkSwapchainKHR obj,
{
SwapchainInfo &info = *GetRecord(obj)->swapInfo;
RenderDoc::Inst().RemoveFrameCapturer(m_Instance, info.wndHandle);
RenderDoc::Inst().RemoveFrameCapturer(LayerDisp(m_Instance), info.wndHandle);
VkRenderPass unwrappedRP = Unwrap(info.rp);
GetResourceManager()->ReleaseWrappedResource(info.rp, true);
renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp
+3 -3
View File
@@ -498,7 +498,7 @@ void WrappedVulkan::WrapAndProcessCreatedSwapchain(VkDevice device,
m_SwapLookup[swapInfo.wndHandle] = *pSwapChain;
}
RenderDoc::Inst().AddFrameCapturer(m_Instance, swapInfo.wndHandle, this);
RenderDoc::Inst().AddFrameCapturer(LayerDisp(m_Instance), swapInfo.wndHandle, this);
swapInfo.format = pCreateInfo->imageFormat;
swapInfo.extent = pCreateInfo->imageExtent;
@@ -714,7 +714,7 @@ VkResult WrappedVulkan::vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR
SwapchainInfo &swapInfo = *swaprecord->swapInfo;
bool activeWindow = RenderDoc::Inst().IsActiveWindow(m_Instance, swapInfo.wndHandle);
bool activeWindow = RenderDoc::Inst().IsActiveWindow(LayerDisp(m_Instance), swapInfo.wndHandle);
// need to record which image was last flipped so we can get the correct backbuffer
// for a thumbnail in EndFrameCapture
@@ -832,7 +832,7 @@ VkResult WrappedVulkan::vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR
VkResult vkr = ObjDisp(queue)->QueuePresentKHR(Unwrap(queue), &unwrappedInfo);
Present(m_Instance, swapInfo.wndHandle);
Present(LayerDisp(m_Instance), swapInfo.wndHandle);
return vkr;
}