From 802a5e4b0ae05712673962fefd418866aed719b2 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Sat, 19 Sep 2015 17:23:32 +0200
Subject: [PATCH] Remove our own handling of dbg msg callbacks - come back to
 this later

---
 renderdoc/driver/vulkan/vk_core.cpp | 46 -----------------------------
 renderdoc/driver/vulkan/vk_core.h   |  2 --
 2 files changed, 48 deletions(-)

diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp
index 06bc3784c..8137466c3 100644
--- a/renderdoc/driver/vulkan/vk_core.cpp
+++ b/renderdoc/driver/vulkan/vk_core.cpp
@@ -396,16 +396,6 @@ WrappedVulkan::WrappedVulkan(const char *logFilename)
 
 WrappedVulkan::~WrappedVulkan()
 {
-#if defined(FORCE_VALIDATION_LAYER)
-	if(m_MsgCallback != VK_NULL_HANDLE)
-	{
-		// VKTODOMED [0] isn't right..
-		// GSFTODO Fix this
-		// m_Real.vkDbgDestroyMsgCallback(m_PhysicalReplayData[0].inst, m_MsgCallback);
-		ObjDisp(m_PhysicalReplayData[0].inst)->DbgDestroyMsgCallback(Unwrap(m_PhysicalReplayData[0].inst), m_MsgCallback);
-	}
-#endif
-
 	// VKTODOLOW should only have one swapchain, since we are only handling the simple case
 	// of one device, etc for now.
 	RDCASSERT(m_SwapChainInfo.size() == 1);
@@ -475,19 +465,6 @@ VkResult WrappedVulkan::vkCreateInstance(
 	}
 #endif
 
-	// VKTODOLOW we should try and fetch vkDbgCreateMsgCallback ourselves if it isn't
-	// already loaded
-	PFN_vkDbgCreateMsgCallback dcmc_fn = ObjDisp(inst)->DbgCreateMsgCallback;
-	if(RenderDoc::Inst().GetCaptureOptions().DebugDeviceMode && dcmc_fn)
-	{
-		VkFlags flags = VK_DBG_REPORT_INFO_BIT |
-										VK_DBG_REPORT_WARN_BIT |
-										VK_DBG_REPORT_PERF_WARN_BIT |
-										VK_DBG_REPORT_ERROR_BIT |
-										VK_DBG_REPORT_DEBUG_BIT;
-		dcmc_fn(Unwrap(inst), flags, &DebugCallbackStatic, this, &m_MsgCallback);
-	}
-
 	if(m_State >= WRITING)
 	{
 		m_InitParams.Set(pCreateInfo, GetResID(inst));
@@ -502,11 +479,6 @@ VkResult WrappedVulkan::vkCreateInstance(
 VkResult WrappedVulkan::vkDestroyInstance(
 		VkInstance                                  instance)
 {
-	if(RenderDoc::Inst().GetCaptureOptions().DebugDeviceMode && m_MsgCallback != VK_NULL_HANDLE)
-	{
-		ObjDisp(instance)->DbgDestroyMsgCallback(Unwrap(instance), m_MsgCallback);
-	}
-
 	dispatch_key key = get_dispatch_key(instance);
 	VkResult ret = ObjDisp(instance)->DestroyInstance(Unwrap(instance));
 
@@ -761,24 +733,6 @@ bool WrappedVulkan::Serialise_vkCreateDevice(
 				vkr = ObjDisp(*pDevice)->CreateCommandBuffer(Unwrap(device), &cmdInfo, &m_PhysicalReplayData[i].cmd);
 				RDCASSERT(vkr == VK_SUCCESS);
 
-#if defined(FORCE_VALIDATION_LAYER)
-				if(ObjDisp(*pDevice)->DbgCreateMsgCallback)
-				{
-					VkFlags flags = VK_DBG_REPORT_INFO_BIT |
-						VK_DBG_REPORT_WARN_BIT |
-						VK_DBG_REPORT_PERF_WARN_BIT |
-						VK_DBG_REPORT_ERROR_BIT |
-						VK_DBG_REPORT_DEBUG_BIT;
-					vkr = ObjDisp(*pDevice)->DbgCreateMsgCallback(Unwrap(m_PhysicalReplayData[i].inst), flags, &DebugCallbackStatic, this, &m_MsgCallback);
-					RDCASSERT(vkr == VK_SUCCESS);
-					RDCLOG("Created dbg callback");
-				}
-				else
-				{
-					RDCLOG("No dbg callback");
-				}
-#endif
-
 				found = true;
 				break;
 			}
diff --git a/renderdoc/driver/vulkan/vk_core.h b/renderdoc/driver/vulkan/vk_core.h
index a230b0f49..c982145b2 100644
--- a/renderdoc/driver/vulkan/vk_core.h
+++ b/renderdoc/driver/vulkan/vk_core.h
@@ -209,8 +209,6 @@ private:
 	vector<ReplayData> m_PhysicalReplayData;
 	int m_SwapPhysDevice;
 
-	VkDbgMsgCallback m_MsgCallback;
-	
 	struct ExtensionSupport
 	{
 		vector<VkExtensionProperties> renderdoc;