Module: vkd3d Branch: master Commit: a25a2086a56fce5a4ff7fbf2e7bb5dfd1a58e914 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a25a2086a56fce5a4ff7fbf2...
Author: Józef Kucia jkucia@codeweavers.com Date: Wed Jan 24 14:33:36 2018 +0100
libs/vkd3d: Do not enable swapchain extensions by default.
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
---
libs/vkd3d/device.c | 13 ++----------- libs/vkd3d/vkd3d_private.h | 1 - 2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index bec8f35..8658014 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -26,12 +26,6 @@ struct vkd3d_optional_extension_info 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[] = { {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[] = { VK_KHR_MAINTENANCE1_EXTENSION_NAME, - VK_KHR_SWAPCHAIN_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); }
- *instance_extension_count = vkd3d_check_extensions(vk_extensions, count, - required_instance_extensions, ARRAY_SIZE(required_instance_extensions), + *instance_extension_count = vkd3d_check_extensions(vk_extensions, count, NULL, 0, optional_instance_extensions, ARRAY_SIZE(optional_instance_extensions), create_info->instance_extensions, create_info->instance_extension_count, vulkan_info, "instance"); @@ -309,8 +301,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, instance_info.pApplicationInfo = &application_info; instance_info.enabledLayerCount = 0; instance_info.ppEnabledLayerNames = NULL; - instance_info.enabledExtensionCount = vkd3d_enable_extensions(extensions, - required_instance_extensions, ARRAY_SIZE(required_instance_extensions), + instance_info.enabledExtensionCount = vkd3d_enable_extensions(extensions, NULL, 0, optional_instance_extensions, ARRAY_SIZE(optional_instance_extensions), create_info->instance_extensions, create_info->instance_extension_count, &instance->vk_info); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index b360785..a60ee99 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -20,7 +20,6 @@ #define __VKD3D_PRIVATE_H
#define VK_NO_PROTOTYPES -#define VK_USE_PLATFORM_XCB_KHR
#define COBJMACROS #define NONAMELESSUNION