lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-07-13 02:56:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle chained physdev feature structs in vkCreateDevice. Closes #1157

Browse Source
This commit is contained in:
baldurk
2018-11-20 16:04:46 +00:00
parent 0eb915447a
commit 648eeaa42e
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp
+19 -5
View File
@@ -1876,8 +1876,19 @@ VkResult WrappedVulkan::vkCreateDevice(VkPhysicalDevice physicalDevice,
// default to all off. This is equivalent to createInfo.pEnabledFeatures == NULL
VkPhysicalDeviceFeatures enabledFeatures = {0};
// if the user enabled features, of course we want to enable them.
if(createInfo.pEnabledFeatures)
// allocate and unwrap the next chain, so we can patch features if we need to, as well as removing
// the loader info later when it comes time to serialise
byte *tempMem = GetTempMemory(GetNextPatchSize(createInfo.pNext));
UnwrapNextChain(m_State, "VkDeviceCreateInfo", tempMem, (VkBaseInStructure *)&createInfo);
VkPhysicalDeviceFeatures2 *enabledFeatures2 = (VkPhysicalDeviceFeatures2 *)FindNextStruct(
&createInfo, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2);
// VkPhysicalDeviceFeatures2 takes priority
if(enabledFeatures2)
enabledFeatures = enabledFeatures2->features;
else if(createInfo.pEnabledFeatures)
enabledFeatures = *createInfo.pEnabledFeatures;
if(availFeatures.shaderStorageImageWriteWithoutFormat)
@@ -1911,14 +1922,17 @@ VkResult WrappedVulkan::vkCreateDevice(VkPhysicalDevice physicalDevice,
else
RDCWARN("pipelineStatisticsQuery = false, pipeline counters will not work");
createInfo.pEnabledFeatures = &enabledFeatures;
// patch the enabled features
if(enabledFeatures2)
enabledFeatures2->features = enabledFeatures;
else if(createInfo.pEnabledFeatures)
createInfo.pEnabledFeatures = &enabledFeatures;
VkResult ret;
SERIALISE_TIME_CALL(ret = createFunc(Unwrap(physicalDevice), &createInfo, pAllocator, pDevice));
// don't serialise out any of the pNext stuff for layer initialisation
// (note that we asserted above that there was nothing else in the chain)
createInfo.pNext = NULL;
RemoveNextStruct(&createInfo, VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO);
if(ret == VK_SUCCESS)
{