wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 8967e87c8a890aed7a81051c2d372f065e825bb2.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-05-25 03:05:27 +02:00
parent 91f6a8ad80
commit 0c46d1e8a2
7 changed files with 133 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 00e6b5dee992743569981db6621fcc5e6956ae52 Mon Sep 17 00:00:00 2001
From 13c96697dd2104a6aaf02d13c7c0700a839d6e64 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)
@@ -22,7 +22,7 @@ Subject: vulkan: Initial implementation. (v2)
create mode 100644 dlls/vulkan/vulkan_thunks.c
diff --git a/configure.ac b/configure.ac
index e8710d0dbbb..b0b58ba60b6 100644
index 7d6566be0e2..0b703d15077 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,6 +81,8 @@ AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xco
@@ -31,10 +31,10 @@ index e8710d0dbbb..b0b58ba60b6 100644
[if test "x$withval" = "xno"; then ac_cv_header_X11_Xcursor_Xcursor_h=no; fi])
+AC_ARG_WITH(xcb, AS_HELP_STRING([--without-xcb],[do not use X11 XCB extension]),
+ [if test "x$withval" = "xno"; then ac_cv_header_X11_Xlib_xcb_h=no; fi])
AC_ARG_WITH(xfixes, AS_HELP_STRING([--without-xfixes],[do not use Xfixes for clipboard change notifications]),
[if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xfixes_h=no; fi])
AC_ARG_WITH(xinerama, AS_HELP_STRING([--without-xinerama],[do not use Xinerama (multi-monitor support)]),
[if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xinerama_h=no; fi])
AC_ARG_WITH(xinput, AS_HELP_STRING([--without-xinput],[do not use the Xinput extension]),
@@ -991,6 +993,7 @@ then
@@ -993,6 +995,7 @@ then
dnl *** All of the following tests require X11/Xlib.h
AC_CHECK_HEADERS([X11/Xlib.h \
@@ -42,7 +42,7 @@ index e8710d0dbbb..b0b58ba60b6 100644
X11/XKBlib.h \
X11/Xutil.h \
X11/Xcursor/Xcursor.h \
@@ -1114,6 +1117,14 @@ then
@@ -1127,6 +1130,14 @@ then
WINE_NOTICE_WITH(xcomposite,[test "x$ac_cv_lib_soname_Xcomposite" = "x"],
[libxcomposite ${notice_platform}development files not found, Xcomposite won't be supported.])
@@ -57,7 +57,7 @@ index e8710d0dbbb..b0b58ba60b6 100644
dnl *** Check for XICCallback struct
AC_CHECK_MEMBERS([XICCallback.callback, XEvent.xcookie],,,
[#ifdef HAVE_X11_XLIB_H
@@ -1175,6 +1186,9 @@ else
@@ -1188,6 +1199,9 @@ else
[enable_winex11_drv])
fi
@@ -67,7 +67,7 @@ index e8710d0dbbb..b0b58ba60b6 100644
dnl **** Check for OpenCL ****
if test "$ac_cv_header_CL_cl_h" = "yes"
then
@@ -3484,6 +3498,8 @@ WINE_CONFIG_DLL(vnbt.vxd,enable_win16)
@@ -3497,6 +3511,8 @@ WINE_CONFIG_DLL(vnbt.vxd,enable_win16)
WINE_CONFIG_DLL(vnetbios.vxd,enable_win16)
WINE_CONFIG_DLL(vssapi)
WINE_CONFIG_DLL(vtdapi.vxd,enable_win16)