diff --git a/renderdoc/driver/vulkan/vk_common.h b/renderdoc/driver/vulkan/vk_common.h index 90fb6787d..1b9ee7883 100644 --- a/renderdoc/driver/vulkan/vk_common.h +++ b/renderdoc/driver/vulkan/vk_common.h @@ -58,6 +58,8 @@ struct VkGenericStruct const VkGenericStruct *pNext; }; +#define RENDERDOC_LAYER_NAME "VK_LAYER_RENDERDOC_Capture" + #define IMPLEMENT_FUNCTION_SERIALISED(ret, func, ...) ret func(__VA_ARGS__); bool CONCAT(Serialise_, func(Serialiser *localSerialiser, __VA_ARGS__)); template<> void Serialiser::Serialise(const char *name, VkRect2D &el); diff --git a/renderdoc/driver/vulkan/vk_tracelayer.cpp b/renderdoc/driver/vulkan/vk_tracelayer.cpp index 49fe3d598..a1f2d9e0b 100644 --- a/renderdoc/driver/vulkan/vk_tracelayer.cpp +++ b/renderdoc/driver/vulkan/vk_tracelayer.cpp @@ -99,26 +99,26 @@ void hooked_vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks* static const VkLayerProperties physLayers[] = { { - "VK_LAYER_RENDERDOC_Capture", - VK_API_VERSION, - VK_MAKE_VERSION(RENDERDOC_VERSION_MAJOR, RENDERDOC_VERSION_MINOR, 0), - "Debugging capture layer for RenderDoc", + RENDERDOC_LAYER_NAME, + VK_API_VERSION, + VK_MAKE_VERSION(RENDERDOC_VERSION_MAJOR, RENDERDOC_VERSION_MINOR, 0), + "Debugging capture layer for RenderDoc", } }; static const VkExtensionProperties physExts[] = { { DEBUG_MARKER_EXTENSION_NAME, - VK_MAKE_VERSION(0, 1, 0), + VK_MAKE_VERSION(0, 1, 0), } }; static const VkLayerProperties globalLayers[] = { { - "VK_LAYER_RENDERDOC_Capture", - VK_API_VERSION, - VK_MAKE_VERSION(RENDERDOC_VERSION_MAJOR, RENDERDOC_VERSION_MINOR, 0), - "Debugging capture layer for RenderDoc", + RENDERDOC_LAYER_NAME, + VK_API_VERSION, + VK_MAKE_VERSION(RENDERDOC_VERSION_MAJOR, RENDERDOC_VERSION_MINOR, 0), + "Debugging capture layer for RenderDoc", } }; diff --git a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp index e1189875b..9ad1768f4 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp @@ -53,7 +53,7 @@ void WrappedVulkan::Initialise(VkInitParams ¶ms) // don't try and create our own layer on replay! for(auto it = params.Layers.begin(); it != params.Layers.end(); ++it) { - if(*it == "RenderDoc") + if(*it == RENDERDOC_LAYER_NAME) { params.Layers.erase(it); break; @@ -409,7 +409,7 @@ bool WrappedVulkan::Serialise_vkCreateDevice( for(uint32_t i=0; i < createInfo.enabledLayerNameCount; i++) { const char **layerNames = (const char **)createInfo.ppEnabledLayerNames; - if(!strcmp(layerNames[i], "RenderDoc")) + if(!strcmp(layerNames[i], RENDERDOC_LAYER_NAME)) { for(uint32_t j=i; j < createInfo.enabledLayerNameCount-1; j++) layerNames[j] = layerNames[j+1];