tests: Do not require libxcb and libx11 headers.

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-08-17 09:56:58 +02:00 committed by Alexandre Julliard
parent b5d2374ff3
commit 8b61583011

View File

@ -19,8 +19,6 @@
#define COBJMACROS #define COBJMACROS
#define INITGUID #define INITGUID
#define WIDL_C_INLINE_WRAPPERS #define WIDL_C_INLINE_WRAPPERS
#define VK_USE_PLATFORM_XCB_KHR
#define VK_USE_PLATFORM_XLIB_KHR
#include "vkd3d_test.h" #include "vkd3d_test.h"
#include <vkd3d.h> #include <vkd3d.h>
@ -215,8 +213,8 @@ static void test_additional_instance_extensions(void)
struct vulkan_extension extensions[] = struct vulkan_extension extensions[] =
{ {
{VK_KHR_SURFACE_EXTENSION_NAME}, {VK_KHR_SURFACE_EXTENSION_NAME},
{VK_KHR_XCB_SURFACE_EXTENSION_NAME}, {"VK_KHR_xcb_surface"},
{VK_KHR_XLIB_SURFACE_EXTENSION_NAME}, {"VK_KHR_xlib_surface"},
}; };
const char *enabled_extensions[ARRAY_SIZE(extensions)]; const char *enabled_extensions[ARRAY_SIZE(extensions)];
@ -249,12 +247,12 @@ static void test_additional_instance_extensions(void)
if (!extensions[i].is_supported) if (!extensions[i].is_supported)
continue; continue;
if (!strcmp(extensions[i].name, VK_KHR_XCB_SURFACE_EXTENSION_NAME)) if (!strcmp(extensions[i].name, "VK_KHR_xcb_surface"))
{ {
pfn = vkGetInstanceProcAddr(vk_instance, "vkCreateXcbSurfaceKHR"); pfn = vkGetInstanceProcAddr(vk_instance, "vkCreateXcbSurfaceKHR");
ok(pfn, "Failed to get proc addr for vkCreateXcbSurfaceKHR.\n"); ok(pfn, "Failed to get proc addr for vkCreateXcbSurfaceKHR.\n");
} }
else if (!strcmp(extensions[i].name, VK_KHR_XLIB_SURFACE_EXTENSION_NAME)) else if (!strcmp(extensions[i].name, "VK_KHR_xlib_surface"))
{ {
pfn = vkGetInstanceProcAddr(vk_instance, "vkCreateXlibSurfaceKHR"); pfn = vkGetInstanceProcAddr(vk_instance, "vkCreateXlibSurfaceKHR");
ok(pfn, "Failed to get proc addr for vkCreateXlibSurfaceKHR.\n"); ok(pfn, "Failed to get proc addr for vkCreateXlibSurfaceKHR.\n");