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

vulkan-Vulkan_Implementation: Move WINE_DECLARE_DEBUG_CHANNEL inside #ifdef.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-03-22 23:56:21 +01:00
parent a3f00d208e
commit 941d4e4383
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
patches/vulkan-Vulkan_Implementation/0001-vulkan-Initial-implementation.patch
View File

@ -1,4 +1,4 @@
From 714f200adf4d127a5669e41a1245c001b408791f Mon Sep 17 00:00:00 2001
From b79f80c148b4ce39db9f16dfaf4fa11ae2f0c1ac Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 19 Mar 2016 00:42:10 +0100
Subject: vulkan: Initial implementation. (v2)
@ -9,10 +9,10 @@ Subject: vulkan: Initial implementation. (v2)
dlls/vulkan-1/vulkan-1.spec | 160 +
dlls/vulkan/Makefile.in | 8 +
dlls/vulkan/vulkan.spec | 160 +
dlls/vulkan/vulkan_main.c | 327 +++
dlls/vulkan/vulkan_main.c | 328 +++
dlls/vulkan/vulkan_private.h | 3296 +++++++++++++++++++++
dlls/vulkan/vulkan_thunks.c | 6593 ++++++++++++++++++++++++++++++++++++++++++
8 files changed, 10561 insertions(+)
8 files changed, 10562 insertions(+)
create mode 100644 dlls/vulkan-1/Makefile.in
create mode 100644 dlls/vulkan-1/vulkan-1.spec
create mode 100644 dlls/vulkan/Makefile.in
@ -431,10 +431,10 @@ index 0000000..9b689ad
+@ stdcall vkWaitForFences(ptr long ptr long int64)
diff --git a/dlls/vulkan/vulkan_main.c b/dlls/vulkan/vulkan_main.c
new file mode 100644
index 0000000..1cc30d1
index 0000000..b060dc2
--- /dev/null
+++ b/dlls/vulkan/vulkan_main.c
@@ -0,0 +1,327 @@
@@ -0,0 +1,328 @@
+/*
+ * Vulkan API implementation
+ *
@ -470,7 +470,6 @@ index 0000000..1cc30d1
+#include "vulkan_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(vulkan);
+WINE_DECLARE_DEBUG_CHANNEL(winediag);
+
+static HINSTANCE vulkan_module;
+
@ -479,6 +478,8 @@ index 0000000..1cc30d1
+#endif
+
+#if defined(HAVE_X11_XLIB_H) && defined(SONAME_LIBX11_XCB)
+WINE_DECLARE_DEBUG_CHANNEL(winediag);
+
+static void *libx11_xcb_handle;
+static typeof(XGetXCBConnection) *pXGetXCBConnection;
+

12
patches/vulkan-Vulkan_Implementation/0002-vulkan-Implement-vkGetPhysicalDeviceWin32Presentatio.patch
View File

@ -1,4 +1,4 @@
From 52134024b89df5cbd86192a948631fe4281f6515 Mon Sep 17 00:00:00 2001
From 91bbda9b333a0c0962193cb7a6837ef5340a2768 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 20 Mar 2016 06:47:56 +0100
Subject: vulkan: Implement vkGetPhysicalDeviceWin32PresentationSupportKHR.
@ -10,12 +10,12 @@ Subject: vulkan: Implement vkGetPhysicalDeviceWin32PresentationSupportKHR.
3 files changed, 85 insertions(+), 3 deletions(-)
diff --git a/dlls/vulkan/vulkan_main.c b/dlls/vulkan/vulkan_main.c
index 1cc30d1..76a27ec 100644
index b060dc2..1ede8c8 100644
--- a/dlls/vulkan/vulkan_main.c
+++ b/dlls/vulkan/vulkan_main.c
@@ -43,6 +43,9 @@ static Display *display;
@@ -44,6 +44,9 @@ static Display *display;
WINE_DECLARE_DEBUG_CHANNEL(winediag);
#if defined(HAVE_X11_XLIB_H) && defined(SONAME_LIBX11_XCB)
static void *libx11_xcb_handle;
+static typeof(xcb_get_setup) *pxcb_get_setup;
+static typeof(xcb_screen_next) *pxcb_screen_next;
@ -23,7 +23,7 @@ index 1cc30d1..76a27ec 100644
static typeof(XGetXCBConnection) *pXGetXCBConnection;
static BOOL init_x11_xcb( void )
@@ -53,7 +56,11 @@ static BOOL init_x11_xcb( void )
@@ -54,7 +57,11 @@ static BOOL init_x11_xcb( void )
return FALSE;
}
@ -36,7 +36,7 @@ index 1cc30d1..76a27ec 100644
return TRUE;
}
@@ -241,14 +248,56 @@ VkResult WINAPI vkCreateWin32SurfaceKHR( VkInstance instance,
@@ -242,14 +249,56 @@ VkResult WINAPI vkCreateWin32SurfaceKHR( VkInstance instance,
return res;
}