Compare commits
174 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
623fdfe7ed | ||
|
|
db082f083a | ||
|
|
b44dc29930 | ||
|
|
af6c1782a2 | ||
|
|
e8364c165f | ||
|
|
e6559db2a3 | ||
|
|
93da4dc922 | ||
|
|
a64cc2643d | ||
|
|
ac54b336e3 | ||
|
|
f30e696159 | ||
|
|
64e0d3f26e | ||
|
|
cb3a9e84ce | ||
|
|
1a90d98aba | ||
|
|
533469bd7f | ||
|
|
fde00fdab1 | ||
|
|
39b67234f3 | ||
|
|
f829700928 | ||
|
|
cd9d5f0876 | ||
|
|
66c41f94e5 | ||
|
|
7383a6f78f | ||
|
|
d4a8da5c37 | ||
|
|
d82bea6dc8 |
||
|
|
02a6e3f7e2 |
||
|
|
a8574c637a |
||
|
|
68367aba7b |
||
|
|
721169b2f0 | ||
|
|
7d44cb18f7 | ||
|
|
1ee4875723 | ||
|
|
3dbc55d5a9 | ||
|
|
65a088941c | ||
|
|
d634485766 | ||
|
|
428f5cdcd6 | ||
|
|
0701a14791 | ||
|
|
093e8c9872 |
||
|
|
51aea0fd13 | ||
|
|
11b57cc76c | ||
|
|
224f258335 | ||
|
|
4f7f54d832 | ||
|
|
4680f67470 | ||
|
|
addab1900b | ||
|
|
23af794d91 | ||
|
|
7bd6d8e69b | ||
|
|
c1fa31f355 | ||
|
|
e1a56cbec0 | ||
|
|
1cdf531389 | ||
|
|
7fb0a75c9b | ||
|
|
efa2d4ec81 | ||
|
|
e6275b7668 | ||
|
|
e23840473e | ||
|
|
ae42a21887 | ||
|
|
c7883a3aba | ||
|
|
4e3c1641bc | ||
|
|
c1abb56f41 | ||
|
|
511e26fc71 | ||
|
|
3e01363315 |
||
|
|
2bb8fb0ea8 | ||
|
|
ddb27240da | ||
|
|
d6ff1f55a3 | ||
|
|
da5f7cc6a9 | ||
|
|
7a71095b44 | ||
|
|
e767efedd9 | ||
|
|
f60ac4c5bf | ||
|
|
e004faf7af | ||
|
|
f161348b82 |
||
|
|
1b412dc4d6 |
||
|
|
55a3310521 |
||
|
|
c3096378b1 |
||
|
|
2e413fca53 |
||
|
|
b263e78edd |
||
|
|
c582f5fc33 |
||
|
|
56708c18ab |
||
|
|
33346baa11 | ||
|
|
7ff13e55b3 | ||
|
|
7c38d157ad | ||
|
|
d038b1d74a | ||
|
|
cd13acb1c0 | ||
|
|
b6dbe710ac | ||
|
|
5f9467af56 | ||
|
|
cf3d3e4de9 | ||
|
|
519865b769 | ||
|
|
3cffb3e9cd | ||
|
|
9ca61ed4fb | ||
|
|
aee1016fb9 | ||
|
|
1710080362 | ||
|
|
38d5389de5 | ||
|
|
cd1d45170b | ||
|
|
0c6186e21c | ||
|
|
4bd4c29784 | ||
|
|
f2dd5f32e3 | ||
|
|
d64a90d527 | ||
|
|
3cbd6000b6 | ||
|
|
3789343596 | ||
|
|
20cf6562e1 | ||
|
|
eaa22d0e41 | ||
|
|
ca2ad08c44 | ||
|
|
ebc7fa1000 | ||
|
|
ad5e9c3120 | ||
|
|
8e731b9cb9 | ||
|
|
b687a89edf | ||
|
|
0e97df7d85 | ||
|
|
3e27bd8eee | ||
|
|
8e53c8a627 | ||
|
|
4ceed3ffe2 | ||
|
|
6da40cfff8 | ||
|
|
b45c7c99cb | ||
|
|
bb023fac43 | ||
|
|
c61376690a | ||
|
|
c40bb1925a | ||
|
|
0a5238b4bd | ||
|
|
9858114030 | ||
|
|
b7a1f713fe | ||
|
|
c8c81d2398 | ||
|
|
552cb045db | ||
|
|
6a539bd720 | ||
|
|
55482fecf2 | ||
|
|
3b68af45f1 | ||
|
|
5b27b74f4d | ||
|
|
3be0458843 | ||
|
|
947c943623 | ||
|
|
a3e2f7a5dc | ||
|
|
d9c9f057ba | ||
|
|
17f126ebed | ||
|
|
e8cae40f2f | ||
|
|
a0465378b4 | ||
|
|
bf9fa32bb2 | ||
|
|
baa57bab54 | ||
|
|
c01aecc816 | ||
|
|
5fba36fcda | ||
|
|
ed2a342900 | ||
|
|
588d11eb6a | ||
|
|
02e3f382f3 | ||
|
|
7d31b71a6c | ||
|
|
1d82731a68 | ||
|
|
1bc03e18f0 | ||
|
|
b24dd04b6f | ||
|
|
fdec62c273 |
||
|
|
69e128d3e5 |
||
|
|
c7601bd7a6 |
||
|
|
39b79130e5 |
||
|
|
b18af70717 |
||
|
|
145afd58b6 |
||
|
|
a6bc1ef458 | ||
|
|
cc1ecf997b |
||
|
|
6cd6649e77 |
||
|
|
99c5df0338 |
||
|
|
e833139b80 | ||
|
|
1e9513dd71 | ||
|
|
1a22c39969 |
||
|
|
2cdd5f9c87 |
||
|
|
ec85bcf905 | ||
|
|
9e906e5183 | ||
|
|
0ebc357423 | ||
|
|
7a118bcc58 | ||
|
|
e026ad86df | ||
|
|
e5c4dd3f3a | ||
|
|
d05a07d97e | ||
|
|
993ebb7347 | ||
|
|
18a8157a99 | ||
|
|
04635eddac | ||
|
|
9b64e213c7 | ||
|
|
6988e6d6f7 | ||
|
|
2d7352e387 | ||
|
|
9f62dc5403 | ||
|
|
dc5519726f | ||
|
|
ca10619371 | ||
|
|
8611d14b1a | ||
|
|
ab38f0c79a | ||
|
|
8631a7489b | ||
|
|
034c22ecad | ||
|
|
d98c10fc50 | ||
|
|
6aefa6dd9f | ||
|
|
ce628f3168 | ||
|
|
7e107304d2 | ||
|
|
60d1c6ae72 |
8 changed files with 1589 additions and 1802 deletions
6
.gitignore
vendored
6
.gitignore
vendored
|
|
@ -1,3 +1,3 @@
|
|||
/wine-6.3.tar.xz
|
||||
/wine-6.3.tar.xz.sign
|
||||
/wine-staging-6.3.tar.gz
|
||||
/wine-*.tar.xz
|
||||
/wine-*.tar.xz.sign
|
||||
/wine-staging-*.tar.gz
|
||||
|
|
|
|||
6
sources
6
sources
|
|
@ -1,3 +1,3 @@
|
|||
SHA512 (wine-6.3.tar.xz) = 20108ea5036d612e8dd61fe9254d67cad02d757ede87174ed27774e4e3537e0d1f4d67156fd430f1d01d5c68b899cb0c7b4be298d897a1ce823913efef822242
|
||||
SHA512 (wine-6.3.tar.xz.sign) = c7215c43eff6ff7cf7bab3bf598b95fcab87a8d4ac58d94056c7ffa368c66a71e3a1943902038878d063208c25b910335be6389ac263e04bf9abd57a298a58c1
|
||||
SHA512 (wine-staging-6.3.tar.gz) = ed9b3b03c466de03941d7fec00c73ff77df863c3f4ba201e7f920810675ff416995557cb62b6701dcec6928f2ab9e4d608f17b79eda0267094e506a5e66f47f2
|
||||
SHA512 (wine-11.0.tar.xz) = a2c3db14f8cf0d19927466805c8f17c68ee7e93d1196d1162dd2279af497c21ec611a63f7a9de59953bbdfdb44c87d7bf55373c6533224a5d54e434c29428d1b
|
||||
SHA512 (wine-11.0.tar.xz.sign) = b37064b787e4cff05b01f0d04fe2af8ff341e274a41a0238b5e58e392223bcd3574eb593f78ba7de8fb8caea7c27abf2a1259527807a2bec2413aa9ce027e183
|
||||
SHA512 (wine-staging-11.0.tar.gz) = 27eecce0cc1974e97d2aaffc0bf5a5d114f5fd8d3d6a349d9f984058a316b6654dd07bc2223c38df16fd2862f59aa79518d2d109ea0ac41c957144377ddd39a7
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
/usr/lib/wine/
|
||||
|
|
@ -1,146 +0,0 @@
|
|||
From 4cc738f609faff68bf4c67d5618174fa87ab3cdb Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Felix=20H=C3=A4dicke?= <felixhaedicke@web.de>
|
||||
Date: Wed, 10 Jul 2019 22:19:31 +0200
|
||||
Subject: [PATCH] winex11.drv: Support child window rendering for Vulkan via
|
||||
XComposite
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45277
|
||||
Signed-off-by: Felix Hädicke <felixhaedicke@web.de>
|
||||
---
|
||||
dlls/winex11.drv/vulkan.c | 56 ++++++++++++++++++++++++++++++++-------
|
||||
1 file changed, 47 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c
|
||||
index 28ae1a9e0e8..3b0bf58c107 100644
|
||||
--- a/dlls/winex11.drv/vulkan.c
|
||||
+++ b/dlls/winex11.drv/vulkan.c
|
||||
@@ -33,6 +33,7 @@
|
||||
#include "wine/debug.h"
|
||||
#include "wine/heap.h"
|
||||
#include "x11drv.h"
|
||||
+#include "xcomposite.h"
|
||||
|
||||
#define VK_NO_PROTOTYPES
|
||||
#define WINE_VK_HOST
|
||||
@@ -55,6 +56,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug =
|
||||
static CRITICAL_SECTION context_section = { &critsect_debug, -1, 0, 0, 0, 0 };
|
||||
|
||||
static XContext vulkan_hwnd_context;
|
||||
+static XContext vulkan_swapchain_surface_context;
|
||||
|
||||
#define VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR 1000004000
|
||||
|
||||
@@ -62,6 +64,7 @@ struct wine_vk_surface
|
||||
{
|
||||
LONG ref;
|
||||
Window window;
|
||||
+ HDC child_window_dc;
|
||||
VkSurfaceKHR surface; /* native surface */
|
||||
};
|
||||
|
||||
@@ -135,6 +138,7 @@ static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context)
|
||||
#undef LOAD_OPTIONAL_FUNCPTR
|
||||
|
||||
vulkan_hwnd_context = XUniqueContext();
|
||||
+ vulkan_swapchain_surface_context = XUniqueContext();
|
||||
|
||||
return TRUE;
|
||||
|
||||
@@ -252,16 +256,24 @@ static VkResult X11DRV_vkCreateSwapchainKHR(VkDevice device,
|
||||
const VkSwapchainCreateInfoKHR *create_info,
|
||||
const VkAllocationCallbacks *allocator, VkSwapchainKHR *swapchain)
|
||||
{
|
||||
+ VkResult res;
|
||||
VkSwapchainCreateInfoKHR create_info_host;
|
||||
+ struct wine_vk_surface *x11_surface = surface_from_handle(create_info->surface);
|
||||
+
|
||||
TRACE("%p %p %p %p\n", device, create_info, allocator, swapchain);
|
||||
|
||||
if (allocator)
|
||||
FIXME("Support for allocation callbacks not implemented yet\n");
|
||||
|
||||
create_info_host = *create_info;
|
||||
- create_info_host.surface = surface_from_handle(create_info->surface)->surface;
|
||||
+ create_info_host.surface = x11_surface->surface;
|
||||
|
||||
- return pvkCreateSwapchainKHR(device, &create_info_host, NULL /* allocator */, swapchain);
|
||||
+ res = pvkCreateSwapchainKHR(device, &create_info_host, NULL /* allocator */, swapchain);
|
||||
+ if (res == VK_SUCCESS)
|
||||
+ {
|
||||
+ XSaveContext(gdi_display, (XID)(*swapchain), vulkan_swapchain_surface_context, (char *)x11_surface);
|
||||
+ }
|
||||
+ return res;
|
||||
}
|
||||
|
||||
static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance,
|
||||
@@ -277,13 +289,6 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance,
|
||||
if (allocator)
|
||||
FIXME("Support for allocation callbacks not implemented yet\n");
|
||||
|
||||
- /* TODO: support child window rendering. */
|
||||
- if (GetAncestor(create_info->hwnd, GA_PARENT) != GetDesktopWindow())
|
||||
- {
|
||||
- FIXME("Application requires child window rendering, which is not implemented yet!\n");
|
||||
- return VK_ERROR_INCOMPATIBLE_DRIVER;
|
||||
- }
|
||||
-
|
||||
x11_surface = heap_alloc_zero(sizeof(*x11_surface));
|
||||
if (!x11_surface)
|
||||
return VK_ERROR_OUT_OF_HOST_MEMORY;
|
||||
@@ -300,6 +305,23 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance,
|
||||
goto err;
|
||||
}
|
||||
|
||||
+ /* child window rendering. */
|
||||
+ if (GetAncestor(create_info->hwnd, GA_PARENT) != GetDesktopWindow())
|
||||
+ {
|
||||
+#ifdef SONAME_LIBXCOMPOSITE
|
||||
+ if (usexcomposite)
|
||||
+ {
|
||||
+ pXCompositeRedirectWindow(gdi_display, x11_surface->window, CompositeRedirectManual);
|
||||
+ x11_surface->child_window_dc = GetDC(create_info->hwnd);
|
||||
+ }
|
||||
+ else
|
||||
+#endif
|
||||
+ {
|
||||
+ FIXME("Child window rendering is not supported without X Composite Extension!\n");
|
||||
+ return VK_ERROR_INCOMPATIBLE_DRIVER;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
create_info_host.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR;
|
||||
create_info_host.pNext = NULL;
|
||||
create_info_host.flags = 0; /* reserved */
|
||||
@@ -369,6 +391,7 @@ static void X11DRV_vkDestroySwapchainKHR(VkDevice device, VkSwapchainKHR swapcha
|
||||
FIXME("Support for allocation callbacks not implemented yet\n");
|
||||
|
||||
pvkDestroySwapchainKHR(device, swapchain, NULL /* allocator */);
|
||||
+ XDeleteContext(gdi_display, (XID)swapchain, vulkan_swapchain_surface_context);
|
||||
}
|
||||
|
||||
static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_name,
|
||||
@@ -541,6 +564,21 @@ static VkResult X11DRV_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR *
|
||||
}
|
||||
}
|
||||
|
||||
+ for (uint32_t i = 0 ; i < present_info->swapchainCount; ++i)
|
||||
+ {
|
||||
+ struct wine_vk_surface *x11_surface;
|
||||
+ if (!XFindContext(gdi_display, (XID)present_info->pSwapchains[i],
|
||||
+ vulkan_swapchain_surface_context, (char **)&x11_surface) &&
|
||||
+ x11_surface->child_window_dc)
|
||||
+ {
|
||||
+ struct x11drv_escape_flush_gl_drawable escape;
|
||||
+ escape.code = X11DRV_FLUSH_GL_DRAWABLE;
|
||||
+ escape.gl_drawable = x11_surface->window;
|
||||
+ escape.flush = TRUE;
|
||||
+ ExtEscape(x11_surface->child_window_dc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
return res;
|
||||
}
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
/usr/lib64/wine/
|
||||
1
wine-ntsync.conf
Normal file
1
wine-ntsync.conf
Normal file
|
|
@ -0,0 +1 @@
|
|||
ntsync
|
||||
89
wine.init
89
wine.init
|
|
@ -1,89 +0,0 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# wine Allow users to run Windows(tm) applications by just clicking on them
|
||||
# (or typing ./file.exe)
|
||||
#
|
||||
# chkconfig: 35 98 10
|
||||
# description: Allow users to run Windows(tm) applications by just clicking \
|
||||
# on them (or typing ./file.exe)
|
||||
### BEGIN INIT INFO
|
||||
# Provides: wine-binfmt
|
||||
# Required-Start:
|
||||
# Required-Stop:
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Add and remove wine binary handler
|
||||
# Description: Allow users to run Windows(tm) applications by just clicking
|
||||
# on them (or typing ./file.exe)
|
||||
### END INIT INFO
|
||||
|
||||
|
||||
. /etc/rc.d/init.d/functions
|
||||
RETVAL=0
|
||||
|
||||
start() {
|
||||
# fix bug on changing runlevels #213230
|
||||
if [ -e /proc/sys/fs/binfmt_misc/windows ]; then
|
||||
echo -n $"Binary handler for Windows applications already registered"
|
||||
else
|
||||
echo -n $"Registering binary handler for Windows applications: "
|
||||
/sbin/modprobe binfmt_misc &>/dev/null
|
||||
echo ':windows:M::MZ::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
|
||||
echo ':windowsPE:M::PE::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
|
||||
RETVAL=$?
|
||||
[ $RETVAL -eq 0 ] && success || failure
|
||||
fi
|
||||
echo
|
||||
}
|
||||
|
||||
stop() {
|
||||
echo -n $"Unregistering binary handler for Windows applications: "
|
||||
echo "-1" >/proc/sys/fs/binfmt_misc/windows || :
|
||||
echo "-1" >/proc/sys/fs/binfmt_misc/windowsPE || :
|
||||
RETVAL=$?
|
||||
[ $RETVAL -eq 0 ] && success || failure
|
||||
echo
|
||||
}
|
||||
|
||||
wine_status() {
|
||||
if [ -e /proc/sys/fs/binfmt_misc/windows ]; then
|
||||
echo $"Wine binary format handlers are registered."
|
||||
return 0
|
||||
else
|
||||
echo $"Wine binary format handlers are not registered."
|
||||
return 3
|
||||
fi
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
start
|
||||
;;
|
||||
stop)
|
||||
stop
|
||||
;;
|
||||
status)
|
||||
wine_status
|
||||
RETVAL=$?
|
||||
;;
|
||||
restart)
|
||||
stop
|
||||
start
|
||||
;;
|
||||
reload)
|
||||
stop
|
||||
start
|
||||
;;
|
||||
condrestart|try-restart)
|
||||
|
||||
if [ -e /proc/sys/fs/binfmt_misc/windows ]; then
|
||||
stop
|
||||
start
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
echo $"Usage: $prog {start|stop|status|restart|reload|try-restart}"
|
||||
exit 1
|
||||
esac
|
||||
exit $RETVAL
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue