mirror of
https://github.com/baldurk/renderdoc.git
synced 2026-05-06 01:50:38 +00:00
Fix VK_KHR_gpdp2 being added to device extension list, not instance
This commit is contained in:
@@ -162,6 +162,19 @@ ReplayStatus WrappedVulkan::Initialise(VkInitParams ¶ms, uint64_t sectionVer
|
||||
|
||||
AddRequiredExtensions(true, params.Extensions, supportedExtensions);
|
||||
|
||||
if(supportedExtensions.find(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME) ==
|
||||
supportedExtensions.end())
|
||||
{
|
||||
RDCWARN("Unsupported required instance extension for AMD performance counters '%s'",
|
||||
VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME);
|
||||
}
|
||||
else
|
||||
{
|
||||
if(std::find(params.Extensions.begin(), params.Extensions.end(),
|
||||
VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME) == params.Extensions.end())
|
||||
params.Extensions.push_back(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME);
|
||||
}
|
||||
|
||||
// verify that extensions & layers are supported
|
||||
for(size_t i = 0; i < params.Layers.size(); i++)
|
||||
{
|
||||
@@ -982,19 +995,6 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi
|
||||
RDCLOG("Enabling VK_EXT_debug_marker");
|
||||
}
|
||||
|
||||
if(supportedExtensions.find(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME) ==
|
||||
supportedExtensions.end())
|
||||
{
|
||||
RDCWARN("Unsupported required instance extension for AMD performance counters '%s'",
|
||||
VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME);
|
||||
}
|
||||
else
|
||||
{
|
||||
if(std::find(Extensions.begin(), Extensions.end(),
|
||||
VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME) == Extensions.end())
|
||||
Extensions.push_back(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME);
|
||||
}
|
||||
|
||||
// enable VK_EXT_debug_marker if it's available, to fetch shader disassembly
|
||||
if(supportedExtensions.find(VK_AMD_SHADER_INFO_EXTENSION_NAME) != supportedExtensions.end())
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user