thirdpartymirrors/UnleashedRecomp
1
0
Fork 0
mirror of https://github.com/hedge-dev/UnleashedRecomp.git synced 2025-12-19 22:42:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Enable buffer device address feature.

Browse source
This commit is contained in:
Skyth 2024-10-07 22:22:05 +03:00
parent bba19ad66d
commit b876766848
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
UnleashedRecomp/gpu/rhi/rt64_vulkan.cpp
View file

@ -59,6 +59,7 @@ namespace RT64 {
VK_KHR_SWAPCHAIN_EXTENSION_NAME, VK_KHR_SWAPCHAIN_EXTENSION_NAME,
VK_EXT_SCALAR_BLOCK_LAYOUT_EXTENSION_NAME, VK_EXT_SCALAR_BLOCK_LAYOUT_EXTENSION_NAME,
VK_EXT_ROBUSTNESS_2_EXTENSION_NAME, VK_EXT_ROBUSTNESS_2_EXTENSION_NAME,
VK_KHR_BUFFER_DEVICE_ADDRESS_EXTENSION_NAME,
# ifdef VULKAN_OBJECT_NAMES_ENABLED # ifdef VULKAN_OBJECT_NAMES_ENABLED
VK_EXT_DEBUG_UTILS_EXTENSION_NAME VK_EXT_DEBUG_UTILS_EXTENSION_NAME
# endif # endif
@ -3466,6 +3467,11 @@ namespace RT64 {
robustnessFeatures.pNext = featuresChain; robustnessFeatures.pNext = featuresChain;
featuresChain = &robustnessFeatures; featuresChain = &robustnessFeatures;
VkPhysicalDeviceBufferDeviceAddressFeatures bufferDeviceAddressFeatures = {};
bufferDeviceAddressFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES;
bufferDeviceAddressFeatures.pNext = featuresChain;
featuresChain = &bufferDeviceAddressFeatures;
VkPhysicalDeviceFeatures2 deviceFeatures = {}; VkPhysicalDeviceFeatures2 deviceFeatures = {};
deviceFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2; deviceFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2;
deviceFeatures.pNext = featuresChain; deviceFeatures.pNext = featuresChain;
@ -3473,10 +3479,8 @@ namespace RT64 {
void *createDeviceChain = nullptr; void *createDeviceChain = nullptr;
VkPhysicalDeviceRayTracingPipelineFeaturesKHR rtPipelineFeatures = {}; VkPhysicalDeviceRayTracingPipelineFeaturesKHR rtPipelineFeatures = {};
VkPhysicalDeviceBufferDeviceAddressFeaturesEXT bufferDeviceFeatures = {};
VkPhysicalDeviceAccelerationStructureFeaturesKHR accelerationStructureFeatures = {}; VkPhysicalDeviceAccelerationStructureFeaturesKHR accelerationStructureFeatures = {};
const bool rtSupported = supportedOptionalExtensions.find(VK_KHR_RAY_TRACING_PIPELINE_EXTENSION_NAME) != supportedOptionalExtensions.end(); const bool rtSupported = supportedOptionalExtensions.find(VK_KHR_RAY_TRACING_PIPELINE_EXTENSION_NAME) != supportedOptionalExtensions.end();
const bool bufferDeviceAddressSupported = rtSupported;
if (rtSupported) { if (rtSupported) {
rtPipelineProperties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PIPELINE_PROPERTIES_KHR; rtPipelineProperties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PIPELINE_PROPERTIES_KHR;
@ -3489,11 +3493,6 @@ namespace RT64 {
rtPipelineFeatures.rayTracingPipeline = true; rtPipelineFeatures.rayTracingPipeline = true;
createDeviceChain = &rtPipelineFeatures; createDeviceChain = &rtPipelineFeatures;
bufferDeviceFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES_KHR;
bufferDeviceFeatures.pNext = createDeviceChain;
bufferDeviceFeatures.bufferDeviceAddress = true;
createDeviceChain = &bufferDeviceFeatures;
accelerationStructureFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_FEATURES_KHR; accelerationStructureFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_FEATURES_KHR;
accelerationStructureFeatures.pNext = createDeviceChain; accelerationStructureFeatures.pNext = createDeviceChain;
accelerationStructureFeatures.accelerationStructure = true; accelerationStructureFeatures.accelerationStructure = true;
@ -3537,6 +3536,12 @@ namespace RT64 {
createDeviceChain = &robustnessFeatures; createDeviceChain = &robustnessFeatures;
} }
const bool bufferDeviceAddress = bufferDeviceAddressFeatures.bufferDeviceAddress;
if (bufferDeviceAddress) {
bufferDeviceAddressFeatures.pNext = createDeviceChain;
createDeviceChain = &bufferDeviceAddressFeatures;
}
// Retrieve the information for the queue families. // Retrieve the information for the queue families.
uint32_t queueFamilyCount = 0; uint32_t queueFamilyCount = 0;
vkGetPhysicalDeviceQueueFamilyProperties(physicalDevice, &queueFamilyCount, nullptr); vkGetPhysicalDeviceQueueFamilyProperties(physicalDevice, &queueFamilyCount, nullptr);
@ -3646,7 +3651,7 @@ namespace RT64 {
vmaFunctions.vkCmdCopyBuffer = vkCmdCopyBuffer; vmaFunctions.vkCmdCopyBuffer = vkCmdCopyBuffer;
VmaAllocatorCreateInfo allocatorInfo = {}; VmaAllocatorCreateInfo allocatorInfo = {};
allocatorInfo.flags |= bufferDeviceAddressSupported ? VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT : 0; allocatorInfo.flags |= bufferDeviceAddress ? VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT : 0;
allocatorInfo.physicalDevice = physicalDevice; allocatorInfo.physicalDevice = physicalDevice;
allocatorInfo.device = vk; allocatorInfo.device = vk;
allocatorInfo.pVulkanFunctions = &vmaFunctions; allocatorInfo.pVulkanFunctions = &vmaFunctions;