Skip to content

Commit

Permalink
Remove 'winex11.drv: Remove unused X11DRV_GET_DRAWABLE ExtEscape code…
Browse files Browse the repository at this point in the history 
…' patch from both valve_protonç_fullscreen_hack-staging and childwindow-proton patchsets. This reportedly breaks gallium-nine which relies on this. Thanks to @niobium93 for reporting.

Fixes #783
  • Loading branch information
@Tk-Glitch
Tk-Glitch committed Jun 9, 2022
1 parent 0a2faba commit 9787d66
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 118 deletions.
59 changes: 0 additions & 59 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 @@ -722,65 +722,6 @@ index d702105c64b..1a077d9323e 100644
result = pvkCreateSwapchainKHR(device, &create_info_host, NULL /* allocator */, swapchain);
if (result == VK_SUCCESS)
{
From 96b82203f192eade6910f4ac2ecb188e27d22feb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <[email protected]>
Date: Thu, 11 Mar 2021 23:27:57 +0100
Subject: [PATCH] winex11.drv: Remove unused X11DRV_GET_DRAWABLE ExtEscape
code.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45277
CW-Bug-Id: 16608
---
dlls/winex11.drv/init.c | 8 --------
dlls/winex11.drv/x11drv.h | 9 ---------
2 files changed, 17 deletions(-)

diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
index 0e8d2ffbf9e..8f152eedc69 100644
--- a/dlls/winex11.drv/init.c
+++ b/dlls/winex11.drv/init.c
@@ -222,14 +222,6 @@ static INT CDECL X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOI
return TRUE;
}
break;
- case X11DRV_GET_DRAWABLE:
- if (out_count >= sizeof(struct x11drv_escape_get_drawable))
- {
- struct x11drv_escape_get_drawable *data = out_data;
- data->drawable = physDev->drawable;
- return TRUE;
- }
- break;
case X11DRV_PRESENT_DRAWABLE:
if (in_count >= sizeof(struct x11drv_escape_present_drawable))
{
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index 9c8def1b068..dd7b9be0524 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -335,7 +335,6 @@ extern int *get_window_surface_mapping( int bpp, int *mapping ) DECLSPEC_HIDDEN;
enum x11drv_escape_codes
{
X11DRV_SET_DRAWABLE, /* set current drawable for a DC */
- X11DRV_GET_DRAWABLE, /* get current drawable for a DC */
X11DRV_START_EXPOSURES, /* start graphics exposures */
X11DRV_END_EXPOSURES, /* end graphics exposures */
X11DRV_PRESENT_DRAWABLE, /* present the drawable on screen */
@@ -349,14 +348,6 @@ struct x11drv_escape_set_drawable
RECT dc_rect; /* DC rectangle relative to drawable */
};

-struct x11drv_escape_get_drawable
-{
- enum x11drv_escape_codes code; /* escape code (X11DRV_GET_DRAWABLE) */
- Drawable drawable; /* X drawable */
- Drawable gl_drawable; /* GL drawable */
- int pixel_format; /* internal GL pixel format */
-};
-
struct x11drv_escape_present_drawable
{
enum x11drv_escape_codes code; /* escape code (X11DRV_PRESENT_DRAWABLE) */
From f06b97c57d0abd9ab25289d3ccce12737beef51a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <[email protected]>
Date: Fri, 12 Mar 2021 00:10:49 +0100
Expand Down
59 changes: 0 additions & 59 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 @@ -1703,65 +1703,6 @@ index d702105c64b..1a077d9323e 100644
result = pvkCreateSwapchainKHR(device, &create_info_host, NULL /* allocator */, swapchain);
if (result == VK_SUCCESS)
{
From 96b82203f192eade6910f4ac2ecb188e27d22feb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <[email protected]>
Date: Thu, 11 Mar 2021 23:27:57 +0100
Subject: [PATCH] winex11.drv: Remove unused X11DRV_GET_DRAWABLE ExtEscape
code.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45277
CW-Bug-Id: 16608
---
dlls/winex11.drv/init.c | 8 --------
dlls/winex11.drv/x11drv.h | 9 ---------
2 files changed, 17 deletions(-)

diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
index 0e8d2ffbf9e..8f152eedc69 100644
--- a/dlls/winex11.drv/init.c
+++ b/dlls/winex11.drv/init.c
@@ -222,14 +222,6 @@ static INT CDECL X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOI
return TRUE;
}
break;
- case X11DRV_GET_DRAWABLE:
- if (out_count >= sizeof(struct x11drv_escape_get_drawable))
- {
- struct x11drv_escape_get_drawable *data = out_data;
- data->drawable = physDev->drawable;
- return TRUE;
- }
- break;
case X11DRV_PRESENT_DRAWABLE:
if (in_count >= sizeof(struct x11drv_escape_present_drawable))
{
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index 9c8def1b068..dd7b9be0524 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -335,7 +335,6 @@ extern int *get_window_surface_mapping( int bpp, int *mapping ) DECLSPEC_HIDDEN;
enum x11drv_escape_codes
{
X11DRV_SET_DRAWABLE, /* set current drawable for a DC */
- X11DRV_GET_DRAWABLE, /* get current drawable for a DC */
X11DRV_START_EXPOSURES, /* start graphics exposures */
X11DRV_END_EXPOSURES, /* end graphics exposures */
X11DRV_PRESENT_DRAWABLE, /* present the drawable on screen */
@@ -349,14 +348,6 @@ struct x11drv_escape_set_drawable
RECT dc_rect; /* DC rectangle relative to drawable */
};

-struct x11drv_escape_get_drawable
-{
- enum x11drv_escape_codes code; /* escape code (X11DRV_GET_DRAWABLE) */
- Drawable drawable; /* X drawable */
- Drawable gl_drawable; /* GL drawable */
- int pixel_format; /* internal GL pixel format */
-};
-
struct x11drv_escape_present_drawable
{
enum x11drv_escape_codes code; /* escape code (X11DRV_PRESENT_DRAWABLE) */
From f06b97c57d0abd9ab25289d3ccce12737beef51a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <[email protected]>
Date: Fri, 12 Mar 2021 00:10:49 +0100
Expand Down

1 comment on commit 9787d66

@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.

"That revert was reportedly breaking gallium-nine which relies on x11drv_escape_get_drawable". Clearer.

Please sign in to comment.