wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

libs/vkd3d: Do not enable swapchain extensions by default.

Browse Source 
libvkd3d doesn't use them.

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2018-01-24 14:33:36 +01:00 committed by Alexandre Julliard
parent e9f826bd08
commit a25a2086a5
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/vkd3d/device.c
View File

@ -26,12 +26,6 @@ struct vkd3d_optional_extension_info
ptrdiff_t vulkan_info_offset; ptrdiff_t vulkan_info_offset;
}; };
static const char * const required_instance_extensions[] =
{
VK_KHR_SURFACE_EXTENSION_NAME,
VK_KHR_XCB_SURFACE_EXTENSION_NAME,
};
static const struct vkd3d_optional_extension_info optional_instance_extensions[] = static const struct vkd3d_optional_extension_info optional_instance_extensions[] =
{ {
{VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, {VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME,
@ -41,7 +35,6 @@ static const struct vkd3d_optional_extension_info optional_instance_extensions[]
static const char * const required_device_extensions[] = static const char * const required_device_extensions[] =
{ {
VK_KHR_MAINTENANCE1_EXTENSION_NAME, VK_KHR_MAINTENANCE1_EXTENSION_NAME,
VK_KHR_SWAPCHAIN_EXTENSION_NAME,
VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME,
}; };
@ -195,8 +188,7 @@ static HRESULT vkd3d_init_instance_caps(struct vkd3d_instance *instance,
return hresult_from_vk_result(vr); return hresult_from_vk_result(vr);
} }
*instance_extension_count = vkd3d_check_extensions(vk_extensions, count, *instance_extension_count = vkd3d_check_extensions(vk_extensions, count, NULL, 0,
required_instance_extensions, ARRAY_SIZE(required_instance_extensions),
optional_instance_extensions, ARRAY_SIZE(optional_instance_extensions), optional_instance_extensions, ARRAY_SIZE(optional_instance_extensions),
create_info->instance_extensions, create_info->instance_extension_count, create_info->instance_extensions, create_info->instance_extension_count,
vulkan_info, "instance"); vulkan_info, "instance");
@ -309,8 +301,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance,
instance_info.pApplicationInfo = &application_info; instance_info.pApplicationInfo = &application_info;
instance_info.enabledLayerCount = 0; instance_info.enabledLayerCount = 0;
instance_info.ppEnabledLayerNames = NULL; instance_info.ppEnabledLayerNames = NULL;
instance_info.enabledExtensionCount = vkd3d_enable_extensions(extensions, instance_info.enabledExtensionCount = vkd3d_enable_extensions(extensions, NULL, 0,
required_instance_extensions, ARRAY_SIZE(required_instance_extensions),
optional_instance_extensions, ARRAY_SIZE(optional_instance_extensions), optional_instance_extensions, ARRAY_SIZE(optional_instance_extensions),
create_info->instance_extensions, create_info->instance_extension_count, create_info->instance_extensions, create_info->instance_extension_count,
&instance->vk_info); &instance->vk_info);

1
libs/vkd3d/vkd3d_private.h
View File

@ -20,7 +20,6 @@
#define __VKD3D_PRIVATE_H #define __VKD3D_PRIVATE_H
#define VK_NO_PROTOTYPES #define VK_NO_PROTOTYPES
#define VK_USE_PLATFORM_XCB_KHR
#define COBJMACROS #define COBJMACROS
#define NONAMELESSUNION #define NONAMELESSUNION