lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-07-28 18:31:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check for bufferDeviceAddress feature properly. Closes #1744

Browse Source
This commit is contained in:
baldurk
2020-02-26 16:09:02 +00:00
parent d2e9b49fa1
commit da17ebed57
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp
+23 -12
View File
@@ -2720,19 +2720,30 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi
if(physProps.apiVersion >= VK_MAKE_VERSION(1, 2, 0))
{
VkPhysicalDeviceVulkan12Features *existing = (VkPhysicalDeviceVulkan12Features *)FindNextStruct(
&createInfo, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_FEATURES);
VkPhysicalDeviceVulkan12Features avail12Features = {
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_FEATURES,
};
VkPhysicalDeviceFeatures2 availBase = {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2};
availBase.pNext = &avail12Features;
ObjDisp(physicalDevice)->GetPhysicalDeviceFeatures2(Unwrap(physicalDevice), &availBase);
if(existing)
if(avail12Features.bufferDeviceAddress)
{
existing->bufferDeviceAddress = VK_TRUE;
}
else
{
vk12Features.bufferDeviceAddress = VK_TRUE;
VkPhysicalDeviceVulkan12Features *existing =
(VkPhysicalDeviceVulkan12Features *)FindNextStruct(
&createInfo, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_FEATURES);
perfFeatures.pNext = (void *)createInfo.pNext;
createInfo.pNext = &perfFeatures;
if(existing)
{
existing->bufferDeviceAddress = VK_TRUE;
}
else
{
vk12Features.bufferDeviceAddress = VK_TRUE;
vk12Features.pNext = (void *)createInfo.pNext;
createInfo.pNext = &vk12Features;
}
}
}
else if(KHRbuffer)
@@ -2759,7 +2770,7 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi
bufAddrKHRFeatures.bufferDeviceAddress = VK_TRUE;
bufAddrKHRFeatures.bufferDeviceAddressMultiDevice = VK_FALSE;
pipeExecFeatures.pNext = (void *)createInfo.pNext;
bufAddrKHRFeatures.pNext = (void *)createInfo.pNext;
createInfo.pNext = &bufAddrKHRFeatures;
}
}
@@ -2796,7 +2807,7 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi
bufAddrEXTFeatures.bufferDeviceAddress = VK_TRUE;
bufAddrEXTFeatures.bufferDeviceAddressMultiDevice = VK_FALSE;
pipeExecFeatures.pNext = (void *)createInfo.pNext;
bufAddrEXTFeatures.pNext = (void *)createInfo.pNext;
createInfo.pNext = &bufAddrEXTFeatures;
}
}