Skip to content

Commit

Permalink
Revert "Added winex11: Moved child window buffer copy to vkQueuePrese…
Browse files Browse the repository at this point in the history 
…ntKHR to… (#792)"

This reverts commit 7ea035c.
  • Loading branch information
@Tk-Glitch
Tk-Glitch committed Jul 6, 2022
1 parent f39d6cc commit e7b1f93
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 176 deletions.
88 changes: 0 additions & 88 deletions wine-tkg-git/wine-tkg-patches/misc/childwindow/childwindow-proton.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -959,91 +959,3 @@ index 00000000000..3ab31201d3d
+#endif /* defined(SONAME_LIBXFIXES) */
+
+#endif /* __WINE_XFIXES_H */
From 5ebbeb4784aa9e67f92a295eda46ee1c74b9a1f2 Mon Sep 17 00:00:00 2001
From: antonino <antomani103@gmail.com>
Date: Tue, 28 Jun 2022 22:04:04 +0200
Subject: [PATCH] winex11: Moved child window buffer copy to vkQueuePresentKHR

---
dlls/winex11.drv/vulkan.c | 44 ++++++++++++++++++++++++++++++++-------
1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c
index e46cff364de..d3453ff6a32 100644
--- a/dlls/winex11.drv/vulkan.c
+++ b/dlls/winex11.drv/vulkan.c
@@ -317,8 +317,6 @@ static VkResult X11DRV_vkAcquireNextImageKHR(VkDevice device,
VkSwapchainKHR swapchain, uint64_t timeout, VkSemaphore semaphore,
VkFence fence, uint32_t *image_index)
{
- static int once;
- struct x11drv_escape_present_drawable escape;
struct wine_vk_surface *surface = NULL;
VkResult result;
VkFence orig_fence;
@@ -353,12 +351,6 @@ static VkResult X11DRV_vkAcquireNextImageKHR(VkDevice device,
if (result == VK_SUCCESS && hdc && surface && surface->offscreen)
{
if (wait_fence) pvkWaitForFences(device, 1, &fence, 0, timeout);
- escape.code = X11DRV_PRESENT_DRAWABLE;
- escape.drawable = surface->window;
- escape.flush = TRUE;
- NtGdiExtEscape( hdc, NULL, 0, X11DRV_ESCAPE, sizeof(escape), (char *)&escape, 0, NULL );
- if (surface->present_mode == VK_PRESENT_MODE_MAILBOX_KHR)
- if (once++) FIXME("Application requires child window rendering with mailbox present mode, expect possible tearing!\n");
}

if (fence != orig_fence) pvkDestroyFence(device, fence, NULL);
@@ -790,6 +782,15 @@ static VkResult X11DRV_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR *
{
VkResult res;

+ VkSwapchainKHR swapchain;
+
+ static int once;
+ struct x11drv_escape_present_drawable escape;
+ struct wine_vk_surface *surface = NULL;
+ VkFence orig_fence;
+ BOOL wait_fence = FALSE;
+ HDC hdc = 0;
+
TRACE("%p, %p\n", queue, present_info);

res = pvkQueuePresentKHR(queue, present_info);
@@ -815,6 +816,33 @@ static VkResult X11DRV_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR *
}
}

+ if(res == VK_SUCCESS)
+ {
+ for(uint32_t i = 0; i < present_info->swapchainCount; i++)
+ {
+ swapchain = present_info->pSwapchains[i];
+
+ pthread_mutex_lock(&vulkan_mutex);
+ if (!XFindContext(gdi_display, (XID)swapchain, vulkan_swapchain_context, (char **)&surface))
+ {
+ wine_vk_surface_grab(surface);
+ hdc = surface->hdc;
+ }
+ pthread_mutex_unlock(&vulkan_mutex);
+
+ if (hdc && surface && surface->offscreen)
+ {
+ escape.code = X11DRV_PRESENT_DRAWABLE;
+ escape.drawable = surface->window;
+ escape.flush = TRUE;
+
+ ExtEscape(hdc, X11DRV_ESCAPE, sizeof(escape), (char *)&escape, 0, NULL);
+ if (surface->present_mode == VK_PRESENT_MODE_MAILBOX_KHR)
+ if (once++) FIXME("Application requires child window rendering with mailbox present mode, expect possible tearing!\n");
+ }
+ }
+ }
+
return res;
}

--
2.36.1

88 changes: 0 additions & 88 deletions ...kg-patches/proton/valve_proton_fullscreen_hack/valve_proton_fullscreen_hack-staging.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11587,91 +11587,3 @@ index 096fe54c51b..681fafd610f 100644
driver->DriverUnload = registration->DriverObject->DriverUnload;
registration->DriverObject->DriverUnload = driver_unload;

From ad793ff9cadfd45aa7429e877064b53ae099c40f Mon Sep 17 00:00:00 2001
From: antonino <antomani103@gmail.com>
Date: Wed, 29 Jun 2022 01:59:11 +0200
Subject: [PATCH] Moved child window buffer copy to vkQueuePresentKHR

---
dlls/winex11.drv/vulkan.c | 44 ++++++++++++++++++++++++++++++++-------
1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c
index 340e4d082ec..f30d923905e 100644
--- a/dlls/winex11.drv/vulkan.c
+++ b/dlls/winex11.drv/vulkan.c
@@ -324,8 +324,6 @@ static VkResult X11DRV_vkAcquireNextImageKHR(VkDevice device,
VkSwapchainKHR swapchain, uint64_t timeout, VkSemaphore semaphore,
VkFence fence, uint32_t *image_index)
{
- static int once;
- struct x11drv_escape_present_drawable escape;
struct wine_vk_surface *surface = NULL;
VkResult result;
VkFence orig_fence;
@@ -360,12 +358,6 @@ static VkResult X11DRV_vkAcquireNextImageKHR(VkDevice device,
if (result == VK_SUCCESS && hdc && surface && surface->offscreen)
{
if (wait_fence) pvkWaitForFences(device, 1, &fence, 0, timeout);
- escape.code = X11DRV_PRESENT_DRAWABLE;
- escape.drawable = surface->window;
- escape.flush = TRUE;
- ExtEscape(hdc, X11DRV_ESCAPE, sizeof(escape), (char *)&escape, 0, NULL);
- if (surface->present_mode == VK_PRESENT_MODE_MAILBOX_KHR)
- if (once++) FIXME("Application requires child window rendering with mailbox present mode, expect possible tearing!\n");
}

if (fence != orig_fence) pvkDestroyFence(device, fence, NULL);
@@ -797,6 +789,15 @@ static VkResult X11DRV_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR *
{
VkResult res;

+ VkSwapchainKHR swapchain;
+
+ static int once;
+ struct x11drv_escape_present_drawable escape;
+ struct wine_vk_surface *surface = NULL;
+ VkFence orig_fence;
+ BOOL wait_fence = FALSE;
+ HDC hdc = 0;
+
TRACE("%p, %p\n", queue, present_info);

res = pvkQueuePresentKHR(queue, present_info);
@@ -822,6 +823,33 @@ static VkResult X11DRV_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR *
}
}

+ if(res == VK_SUCCESS)
+ {
+ for(uint32_t i = 0; i < present_info->swapchainCount; i++)
+ {
+ swapchain = present_info->pSwapchains[i];
+
+ EnterCriticalSection(&context_section);
+ if (!XFindContext(gdi_display, (XID)swapchain, vulkan_swapchain_context, (char **)&surface))
+ {
+ wine_vk_surface_grab(surface);
+ hdc = surface->hdc;
+ }
+ LeaveCriticalSection(&context_section);
+
+ if (hdc && surface && surface->offscreen)
+ {
+ escape.code = X11DRV_PRESENT_DRAWABLE;
+ escape.drawable = surface->window;
+ escape.flush = TRUE;
+
+ ExtEscape(hdc, X11DRV_ESCAPE, sizeof(escape), (char *)&escape, 0, NULL);
+ if (surface->present_mode == VK_PRESENT_MODE_MAILBOX_KHR)
+ if (once++) FIXME("Application requires child window rendering with mailbox present mode, expect possible tearing!\n");
+ }
+ }
+ }
+
return res;
}

--
2.36.1

2 comments on commit e7b1f93

@Tk-Glitch
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Random reports seem to point to this change being an issue (sadly, no logs, and no further answers). Since the patch is being updated and fixed for Proton integration, I'll add the updated patchset down the line.

@pac85
Copy link
Contributor

@pac85 pac85 commented on e7b1f93 Aug 11, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, could you give me an idea of what kind of reports you got? To be precise whether it had to do with vsync. Don't worry if you don't have that info. In any case I came at a roadblock with this patch, you can read about it here ValveSoftware/wine#152
Sorry for not keeping you up to date, perhaps it should have been reverted earlier.

Please sign in to comment.