mirrors
/
vkd3d-proton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vkd3d: Always use PDF2/PDP2 without KHR extensions. 

It is core in Vulkan 1.1.

Signed-off-by: Hans-Kristian Arntzen <post@arntzen-software.no>
This commit is contained in:
Hans-Kristian Arntzen 2020-06-11 11:06:35 +02:00
parent d8ca2cef6d
commit 726356ebb1
3 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libs/vkd3d/device.c
View File

@ -128,8 +128,6 @@ struct vkd3d_optional_extension_info
static const struct vkd3d_optional_extension_info optional_instance_extensions[] =
{
/* KHR extensions */
VK_EXTENSION(KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2, KHR_get_physical_device_properties2),
/* EXT extensions */
VK_DEBUG_EXTENSION(EXT_DEBUG_REPORT, EXT_debug_report),
};
@ -905,16 +903,8 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i
vk_prepend_struct(&info->properties2, shader_sm_builtins_properties);
}
if (vulkan_info->KHR_get_physical_device_properties2)
{
VK_CALL(vkGetPhysicalDeviceFeatures2KHR(physical_device, &info->features2));
VK_CALL(vkGetPhysicalDeviceProperties2KHR(physical_device, &info->properties2));
}
else
{
VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &info->features2.features));
VK_CALL(vkGetPhysicalDeviceProperties(physical_device, &info->properties2.properties));
}
VK_CALL(vkGetPhysicalDeviceFeatures2(physical_device, &info->features2));
VK_CALL(vkGetPhysicalDeviceProperties2(physical_device, &info->properties2));
}
static void vkd3d_trace_physical_device_properties(const VkPhysicalDeviceProperties *properties)

2
libs/vkd3d/vkd3d_private.h
View File

@ -105,8 +105,6 @@ HRESULT hresult_from_vkd3d_result(int vkd3d_result) DECLSPEC_HIDDEN;
struct vkd3d_vulkan_info
{
/* KHR instance extensions */
bool KHR_get_physical_device_properties2;
/* EXT instance extensions */
bool EXT_debug_report;

6
libs/vkd3d/vulkan_procs.h
View File

@ -46,10 +46,8 @@ VK_INSTANCE_PFN(vkGetPhysicalDeviceMemoryProperties)
VK_INSTANCE_PFN(vkGetPhysicalDeviceProperties)
VK_INSTANCE_PFN(vkGetPhysicalDeviceQueueFamilyProperties)
VK_INSTANCE_PFN(vkGetPhysicalDeviceSparseImageFormatProperties)
/* VK_KHR_get_physical_device_properties2 */
VK_INSTANCE_EXT_PFN(vkGetPhysicalDeviceFeatures2KHR)
VK_INSTANCE_EXT_PFN(vkGetPhysicalDeviceProperties2KHR)
VK_INSTANCE_PFN(vkGetPhysicalDeviceFeatures2)
VK_INSTANCE_PFN(vkGetPhysicalDeviceProperties2)
/* VK_EXT_debug_report */
VK_INSTANCE_EXT_PFN(vkCreateDebugReportCallbackEXT)