lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-07-21 06:51:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move layer name to central location

Browse Source
This commit is contained in:
baldurk
2016-02-07 18:48:43 +01:00
parent 002ae7adff
commit bcb1ad7cf7
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_common.h
+2
View File
@@ -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);
renderdoc/driver/vulkan/vk_tracelayer.cpp
+9 -9
View File
@@ -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",
}
};
renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp
+2 -2
View File
@@ -53,7 +53,7 @@ void WrappedVulkan::Initialise(VkInitParams &params)
// 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];