lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-21 22:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Use layer specific dispatch table maps"

Browse Source 
This reverts commit b445ecdaa2a7ae26b468439dbb0b79ad5f1fb78f.
This commit is contained in:
GregF
2016-02-07 18:39:29 +01:00
committed by baldurk
parent a8dfd36525
commit 5c8df903ef
3 changed files with 261 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/LoaderAndTools/layers/vk_layer_table.h
-4
View File
@@ -49,7 +49,3 @@ VkLayerInstanceDispatchTable *get_dispatch_table(instance_table_map &map, void*
void destroy_device_dispatch_table(dispatch_key key);
void destroy_instance_dispatch_table(dispatch_key key);
void destroy_dispatch_table(device_table_map &map, dispatch_key key);
void destroy_dispatch_table(instance_table_map &map, dispatch_key key);
renderdoc/driver/vulkan/rdtrace.cpp
+6 -10
View File
@@ -55,10 +55,6 @@
WrappedVulkan *shadowVulkan = NULL;
// probably should not be extern in final release
extern device_table_map renderdoc_device_table_map;
extern instance_table_map renderdoc_instance_table_map;
// Layer Intercepts
static const VkLayerProperties rdt_physicaldevice_layers[] = {
@@ -197,7 +193,7 @@ VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI vkGetDeviceProcAddr(VkDevice device, co
/* loader uses this to force layer initialization; device object is wrapped */
if (!strcmp("vkGetDeviceProcAddr", pName)) {
initDeviceTable(renderdoc_device_table_map, (const VkBaseLayerObject *) device);
initDeviceTable((const VkBaseLayerObject *) device);
return (PFN_vkVoidFunction) vkGetDeviceProcAddr;
}
@@ -209,9 +205,9 @@ VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI vkGetDeviceProcAddr(VkDevice device, co
return (PFN_vkVoidFunction) vkDestroyDevice;
else
{
if (get_dispatch_table(renderdoc_device_table_map, device)->GetDeviceProcAddr == NULL)
if (device_dispatch_table(device)->GetDeviceProcAddr == NULL)
return NULL;
return get_dispatch_table(renderdoc_device_table_map, device)->GetDeviceProcAddr(device, pName);
return device_dispatch_table(device)->GetDeviceProcAddr(device, pName);
}
}
@@ -222,7 +218,7 @@ VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI vkGetInstanceProcAddr(VkInstance instan
/* loader uses this to force layer initialization; instance object is wrapped */
if (!strcmp("vkGetInstanceProcAddr", pName)) {
initInstanceTable(renderdoc_instance_table_map, (const VkBaseLayerObject *) instance);
initInstanceTable((const VkBaseLayerObject *) instance);
if (shadowVulkan == NULL) {
shadowVulkan = new WrappedVulkan("");
}
@@ -238,8 +234,8 @@ VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI vkGetInstanceProcAddr(VkInstance instan
if (!strcmp("vkGetGlobalLayerProperties", pName))
return (PFN_vkVoidFunction) vkGetGlobalLayerProperties;
if (get_dispatch_table(renderdoc_instance_table_map, instance)->GetInstanceProcAddr == NULL)
if (instance_dispatch_table(instance)->GetInstanceProcAddr == NULL)
return NULL;
return get_dispatch_table(renderdoc_instance_table_map, instance)->GetInstanceProcAddr(instance, pName);
return instance_dispatch_table(instance)->GetInstanceProcAddr(instance, pName);
}
renderdoc/driver/vulkan/vk_core.cpp
+255 -259
View File
File diff suppressed because it is too large Load Diff