=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: tests: Do not require libxcb and libx11 headers.
Alexandre Julliard
julliard at winehq.org
Mon Aug 20 12:42:36 CDT 2018
Module: vkd3d
Branch: master
Commit: 8b6158301146fa3f15a08cfff9c8f2e3be0ae0b3
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8b6158301146fa3f15a08cfff9c8f2e3be0ae0b3
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Fri Aug 17 09:56:58 2018 +0200
tests: Do not require libxcb and libx11 headers.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
tests/vkd3d_api.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c
index e2d9d01..2c022ba 100644
--- a/tests/vkd3d_api.c
+++ b/tests/vkd3d_api.c
@@ -19,8 +19,6 @@
#define COBJMACROS
#define INITGUID
#define WIDL_C_INLINE_WRAPPERS
-#define VK_USE_PLATFORM_XCB_KHR
-#define VK_USE_PLATFORM_XLIB_KHR
#include "vkd3d_test.h"
#include <vkd3d.h>
@@ -215,8 +213,8 @@ static void test_additional_instance_extensions(void)
struct vulkan_extension extensions[] =
{
{VK_KHR_SURFACE_EXTENSION_NAME},
- {VK_KHR_XCB_SURFACE_EXTENSION_NAME},
- {VK_KHR_XLIB_SURFACE_EXTENSION_NAME},
+ {"VK_KHR_xcb_surface"},
+ {"VK_KHR_xlib_surface"},
};
const char *enabled_extensions[ARRAY_SIZE(extensions)];
@@ -249,12 +247,12 @@ static void test_additional_instance_extensions(void)
if (!extensions[i].is_supported)
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");
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");
ok(pfn, "Failed to get proc addr for vkCreateXlibSurfaceKHR.\n");
More information about the wine-cvs
mailing list