diff --git a/renderdoc/driver/vulkan/vk_hookset_defs.h b/renderdoc/driver/vulkan/vk_hookset_defs.h
index cb3ad0b4d..b0ae8b3a4 100644
--- a/renderdoc/driver/vulkan/vk_hookset_defs.h
+++ b/renderdoc/driver/vulkan/vk_hookset_defs.h
@@ -24,11 +24,19 @@
 
 #pragma once
 
+// since we don't use these macros, we undefine them so they don't interfere
+// with bool names etc
+#undef VK_KHR_xlib_surface
+#undef VK_KHR_xcb_surface
+#undef VK_KHR_win32_surface
+#undef VK_KHR_surface
+#undef VK_KHR_swapchain
+
 #if defined(VK_USE_PLATFORM_WIN32_KHR)
 
-#define HookInit_PlatformSpecific() \
-	HookInit(CreateWin32SurfaceKHR); \
-	HookInit(GetPhysicalDeviceWin32PresentationSupportKHR);
+#define HookInitInstance_PlatformSpecific() \
+	HookInitExtension(VK_KHR_win32_surface, CreateWin32SurfaceKHR); \
+	HookInitExtension(VK_KHR_win32_surface, GetPhysicalDeviceWin32PresentationSupportKHR);
 
 #define HookDefine_PlatformSpecific() \
 	HookDefine5(VkResult, vkCreateWin32SurfaceKHR, VkInstance, instance, HINSTANCE, hinstance, HWND, hwnd, const VkAllocationCallbacks*, pAllocator, VkSurfaceKHR*, pSurface); \
@@ -38,9 +46,9 @@
 
 #if defined(VK_USE_PLATFORM_XCB_KHR)
 
-#define HookInit_PlatformSpecific_Xcb() \
-	HookInit(CreateXcbSurfaceKHR); \
-	HookInit(GetPhysicalDeviceXcbPresentationSupportKHR);
+#define HookInitInstance_PlatformSpecific_Xcb() \
+	HookInitExtension(VK_KHR_xcb_surface, CreateXcbSurfaceKHR); \
+	HookInitExtension(VK_KHR_xcb_surface, GetPhysicalDeviceXcbPresentationSupportKHR);
 
 #define HookDefine_PlatformSpecific_Xcb() \
 	HookDefine5(VkResult, vkCreateXcbSurfaceKHR, VkInstance, instance, xcb_connection_t*, connection, xcb_window_t, window, const VkAllocationCallbacks*, pAllocator, VkSurfaceKHR*, pSurface); \
@@ -48,16 +56,16 @@
 
 #else
 
-#define HookInit_PlatformSpecific_Xcb()
+#define HookInitInstance_PlatformSpecific_Xcb()
 #define HookDefine_PlatformSpecific_Xcb()
 
 #endif
 
 #if defined(VK_USE_PLATFORM_XLIB_KHR)
 
-#define HookInit_PlatformSpecific_Xlib() \
-	HookInit(CreateXlibSurfaceKHR); \
-	HookInit(GetPhysicalDeviceXlibPresentationSupportKHR);
+#define HookInitInstance_PlatformSpecific_Xlib() \
+	HookInitExtension(VK_KHR_xlib_surface, CreateXlibSurfaceKHR); \
+	HookInitExtension(VK_KHR_xlib_surface, GetPhysicalDeviceXlibPresentationSupportKHR);
 
 #define HookDefine_PlatformSpecific_Xlib() \
 	HookDefine5(VkResult, vkCreateXlibSurfaceKHR, VkInstance, instance, Display*, dpy, Window, window, const VkAllocationCallbacks*, pAllocator, VkSurfaceKHR*, pSurface); \
@@ -65,12 +73,12 @@
 
 #else
 
-#define HookInit_PlatformSpecific_Xlib()
+#define HookInitInstance_PlatformSpecific_Xlib()
 #define HookDefine_PlatformSpecific_Xlib()
 
 #endif
 
-#define HookInit_PlatformSpecific() HookInit_PlatformSpecific_Xcb() HookInit_PlatformSpecific_Xlib()
+#define HookInitInstance_PlatformSpecific() HookInitInstance_PlatformSpecific_Xcb() HookInitInstance_PlatformSpecific_Xlib()
 #define HookDefine_PlatformSpecific() HookDefine_PlatformSpecific_Xcb() HookDefine_PlatformSpecific_Xlib()
 
 #endif
@@ -85,15 +93,7 @@
 	HookInit(GetPhysicalDeviceSparseImageFormatProperties); \
 	HookInit(GetPhysicalDeviceProperties); \
 	HookInit(GetPhysicalDeviceQueueFamilyProperties); \
-	HookInit(GetPhysicalDeviceMemoryProperties); \
-	HookInit(DbgCreateMsgCallback); \
-	HookInit(DbgDestroyMsgCallback); \
-	HookInit(DestroySurfaceKHR); \
-	HookInit(GetPhysicalDeviceSurfaceSupportKHR); \
-	HookInit(GetPhysicalDeviceSurfaceCapabilitiesKHR); \
-	HookInit(GetPhysicalDeviceSurfaceFormatsKHR); \
-	HookInit(GetPhysicalDeviceSurfacePresentModesKHR); \
-	HookInit_PlatformSpecific()
+	HookInit(GetPhysicalDeviceMemoryProperties);
 
 #define HookInitVulkanDevice() \
 	HookInit(CreateDevice); \
@@ -216,25 +216,41 @@
 	HookInit(CmdBeginRenderPass); \
 	HookInit(CmdNextSubpass); \
 	HookInit(CmdExecuteCommands); \
-	HookInit(CmdEndRenderPass); \
-	HookInit(CreateSwapchainKHR); \
-	HookInit(DestroySwapchainKHR); \
-	HookInit(GetSwapchainImagesKHR); \
-	HookInit(AcquireNextImageKHR); \
-	HookInit(QueuePresentKHR);
+	HookInit(CmdEndRenderPass);
 
-#define CheckInstanceExts()
+// for simplicity and since the check itself is platform agnostic,
+// these aren't protected in platform defines
+#define CheckInstanceExts() \
+	CheckExt(VK_KHR_xlib_surface) \
+	CheckExt(VK_KHR_xcb_surface) \
+	CheckExt(VK_KHR_win32_surface) \
+	CheckExt(VK_KHR_surface) \
+	CheckExt(DEBUG_REPORT)
 
 #define CheckDeviceExts() \
-	CheckExt(VK_LUNARG_DEBUG_MARKER)
+	CheckExt(VK_LUNARG_DEBUG_MARKER) \
+	CheckExt(VK_KHR_swapchain)
 
-#define HookInitVulkanInstanceExts()
+#define HookInitVulkanInstanceExts() \
+	HookInitExtension(VK_KHR_surface, DestroySurfaceKHR); \
+	HookInitExtension(VK_KHR_surface, GetPhysicalDeviceSurfaceSupportKHR); \
+	HookInitExtension(VK_KHR_surface, GetPhysicalDeviceSurfaceCapabilitiesKHR); \
+	HookInitExtension(VK_KHR_surface, GetPhysicalDeviceSurfaceFormatsKHR); \
+	HookInitExtension(VK_KHR_surface, GetPhysicalDeviceSurfacePresentModesKHR); \
+	HookInitExtension(DEBUG_REPORT, DbgCreateMsgCallback); \
+	HookInitExtension(DEBUG_REPORT, DbgDestroyMsgCallback); \
+	HookInitInstance_PlatformSpecific()
 
 #define HookInitVulkanDeviceExts() \
 	HookInitExtension(VK_LUNARG_DEBUG_MARKER, CmdDbgMarkerBegin); \
 	HookInitExtension(VK_LUNARG_DEBUG_MARKER, CmdDbgMarkerEnd); \
 	HookInitExtension(VK_LUNARG_DEBUG_MARKER, DbgSetObjectTag); \
-	HookInitExtension(VK_LUNARG_DEBUG_MARKER, DbgSetObjectName);
+	HookInitExtension(VK_LUNARG_DEBUG_MARKER, DbgSetObjectName); \
+	HookInitExtension(VK_KHR_swapchain, CreateSwapchainKHR); \
+	HookInitExtension(VK_KHR_swapchain, DestroySwapchainKHR); \
+	HookInitExtension(VK_KHR_swapchain, GetSwapchainImagesKHR); \
+	HookInitExtension(VK_KHR_swapchain, AcquireNextImageKHR); \
+	HookInitExtension(VK_KHR_swapchain, QueuePresentKHR);
 
 #define DefineHooks() \
 	HookDefine3(VkResult, vkEnumeratePhysicalDevices, VkInstance, instance, uint32_t*, pPhysicalDeviceCount, VkPhysicalDevice*, pPhysicalDevices); \
diff --git a/renderdoc/driver/vulkan/vk_tracelayer.cpp b/renderdoc/driver/vulkan/vk_tracelayer.cpp
index 66a5e5b56..e419902a1 100644
--- a/renderdoc/driver/vulkan/vk_tracelayer.cpp
+++ b/renderdoc/driver/vulkan/vk_tracelayer.cpp
@@ -215,7 +215,7 @@ VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI_CALL RenderDoc_GetDeviceProcAddr(VkDevi
 
 	if (GetDeviceDispatchTable(device)->GetDeviceProcAddr == NULL)
 		return NULL;
-	return GetDeviceDispatchTable(device)->GetDeviceProcAddr(device, pName);
+	return GetDeviceDispatchTable(device)->GetDeviceProcAddr(Unwrap(device), pName);
 }
 
 VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI_CALL RenderDoc_GetInstanceProcAddr(VkInstance instance, const char* pName)
@@ -236,9 +236,22 @@ VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI_CALL RenderDoc_GetInstanceProcAddr(VkIn
 
 	HookInitVulkanInstance();
 
+	InstanceDeviceInfo *instDevInfo = GetRecord(instance)->instDevInfo;
+
+	HookInitVulkanInstanceExts();
+
+	// GetInstanceProcAddr must also unconditionally return all device functions
+	
+#undef HookInitExtension
+#define HookInitExtension(ext, function) if (!strcmp(pName, STRINGIZE(CONCAT(vk, function)))) return (PFN_vkVoidFunction) &CONCAT(hooked_vk, function);
+
+	HookInitVulkanDevice();
+
+	HookInitVulkanDeviceExts();
+
 	if (GetInstanceDispatchTable(instance)->GetInstanceProcAddr == NULL)
 		return NULL;
-	return GetInstanceDispatchTable(instance)->GetInstanceProcAddr(instance, pName);
+	return GetInstanceDispatchTable(instance)->GetInstanceProcAddr(Unwrap(instance), pName);
 }
 
 }