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

Rename Get*ProcAddr exports to be android friendly. Refs #205

Browse Source
This commit is contained in:
baldurk
2016-03-08 18:04:28 +01:00
parent 097c5f077b
commit fa087b8825
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/renderdoc.json
+2 -2
View File
@@ -8,8 +8,8 @@
"implementation_version": "28",
"description": "Debugging capture layer for RenderDoc",
"functions": {
"vkGetInstanceProcAddr": "RenderDoc_GetInstanceProcAddr",
"vkGetDeviceProcAddr": "RenderDoc_GetDeviceProcAddr"
"vkGetInstanceProcAddr": "VK_LAYER_RENDERDOC_CaptureGetInstanceProcAddr",
"vkGetDeviceProcAddr": "VK_LAYER_RENDERDOC_CaptureGetDeviceProcAddr"
},
"device_extensions": [
{
renderdoc/driver/vulkan/vk_tracelayer.cpp
+8 -8
View File
@@ -167,7 +167,7 @@ VkResult getProps(uint32_t *dstCount, void *dstProps, uint32_t srcCount, void *s
extern "C" {
VK_LAYER_EXPORT VkResult VKAPI_CALL RenderDoc_EnumerateDeviceLayerProperties(
VK_LAYER_EXPORT VkResult VKAPI_CALL VK_LAYER_RENDERDOC_CaptureEnumerateDeviceLayerProperties(
VkPhysicalDevice physicalDevice,
uint32_t* pPropertyCount,
VkLayerProperties* pProperties)
@@ -175,7 +175,7 @@ VK_LAYER_EXPORT VkResult VKAPI_CALL RenderDoc_EnumerateDeviceLayerProperties(
return getProps(pPropertyCount, pProperties, ARRAY_COUNT(physLayers), (void *)physLayers, sizeof(VkLayerProperties));
}
VK_LAYER_EXPORT VkResult VKAPI_CALL RenderDoc_EnumerateDeviceExtensionProperties(
VK_LAYER_EXPORT VkResult VKAPI_CALL VK_LAYER_RENDERDOC_CaptureEnumerateDeviceExtensionProperties(
VkPhysicalDevice physicalDevice,
const char *pLayerName,
uint32_t *pPropertyCount,
@@ -202,10 +202,10 @@ VK_LAYER_EXPORT VkResult VKAPI_CALL RenderDoc_EnumerateDeviceExtensionProperties
// proc addr routines
VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI_CALL RenderDoc_GetDeviceProcAddr(VkDevice device, const char* pName)
VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI_CALL VK_LAYER_RENDERDOC_CaptureGetDeviceProcAddr(VkDevice device, const char* pName)
{
if(!strcmp("vkGetDeviceProcAddr", pName))
return (PFN_vkVoidFunction) &RenderDoc_GetDeviceProcAddr;
return (PFN_vkVoidFunction) &VK_LAYER_RENDERDOC_CaptureGetDeviceProcAddr;
if(!strcmp("vkCreateDevice", pName))
return (PFN_vkVoidFunction) &hooked_vkCreateDevice;
if(!strcmp("vkDestroyDevice", pName))
@@ -225,14 +225,14 @@ VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI_CALL RenderDoc_GetDeviceProcAddr(VkDevi
return GetDeviceDispatchTable(device)->GetDeviceProcAddr(Unwrap(device), pName);
}
VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI_CALL RenderDoc_GetInstanceProcAddr(VkInstance instance, const char* pName)
VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI_CALL VK_LAYER_RENDERDOC_CaptureGetInstanceProcAddr(VkInstance instance, const char* pName)
{
if(!strcmp("vkGetInstanceProcAddr", pName))
return (PFN_vkVoidFunction) &RenderDoc_GetInstanceProcAddr;
return (PFN_vkVoidFunction) &VK_LAYER_RENDERDOC_CaptureGetInstanceProcAddr;
if(!strcmp("vkEnumerateDeviceLayerProperties", pName))
return (PFN_vkVoidFunction) &RenderDoc_EnumerateDeviceLayerProperties;
return (PFN_vkVoidFunction) &VK_LAYER_RENDERDOC_CaptureEnumerateDeviceLayerProperties;
if(!strcmp("vkEnumerateDeviceExtensionProperties", pName))
return (PFN_vkVoidFunction) &RenderDoc_EnumerateDeviceExtensionProperties;
return (PFN_vkVoidFunction) &VK_LAYER_RENDERDOC_CaptureEnumerateDeviceExtensionProperties;
HookInitVulkanInstance();