[PATCH 0/3] MR8262: win32u, winex11: Remove some unnecessary code and members.

[Rémi Bernon]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8262

[PATCH 1/3] win32u: Remove unnecessary window_entry member.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

---
 dlls/win32u/vulkan.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dlls/win32u/vulkan.c b/dlls/win32u/vulkan.c
index 3cd6abede18..048df02c0f7 100644
--- a/dlls/win32u/vulkan.c
+++ b/dlls/win32u/vulkan.c
@@ -53,7 +53,6 @@ struct surface
     HWND hwnd;
 
     struct list entry;
-    struct rb_entry window_entry;
 };
 
 static struct surface *surface_from_handle( VkSurfaceKHR handle )
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/8262

[PATCH 2/3] winex11: Remove unnecessary gl3_context context member.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

---
 dlls/winex11.drv/opengl.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index 4881e504d9e..fa1f556859e 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -197,7 +197,6 @@ struct glx_pixel_format
 struct x11drv_context
 {
     HDC hdc;
-    BOOL gl3_context;
     const struct glx_pixel_format *fmt;
     GLXContext ctx;
     struct gl_drawable *drawables[2];
@@ -1016,7 +1015,7 @@ static GLXContext create_glxcontext(Display *display, struct x11drv_context *con
 {
     GLXContext ctx;
 
-    if(context->gl3_context)
+    if(attribs)
         ctx = pglXCreateContextAttribsARB(gdi_display, context->fmt->fbconfig, shareList, GL_TRUE, attribs);
     else if(context->fmt->visual)
         ctx = pglXCreateContext(gdi_display, context->fmt->visual, shareList, GL_TRUE);
@@ -1640,7 +1639,6 @@ static BOOL x11drv_context_create( HDC hdc, int format, void *share_private, con
         ret->fmt = &pixel_formats[format - 1];
         if (attribList)
         {
-            ret->gl3_context = TRUE;
             /* attribList consists of pairs {token, value] terminated with 0 */
             while(attribList[0] != 0)
             {
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/8262

[PATCH 3/3] winex11: Remove old window drawable lookup and check.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

If a surface has already been created, the window would have a pixel
format set already and the if above this would be taken already.
---
 dlls/winex11.drv/opengl.c | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index fa1f556859e..e4fcd8818c7 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -1128,7 +1128,7 @@ static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct glx_pixel
 static BOOL x11drv_set_pixel_format( HWND hwnd, int old_format, int new_format, BOOL internal )
 {
     const struct glx_pixel_format *fmt;
-    struct gl_drawable *old, *gl;
+    struct gl_drawable *gl;
 
     /* Even for internal pixel format fail setting it if the app has already set a
      * different pixel format. Let wined3d create a backup GL context instead.
@@ -1142,25 +1142,14 @@ static BOOL x11drv_set_pixel_format( HWND hwnd, int old_format, int new_format,
         return FALSE;
     }
 
-    if (!(old = get_gl_drawable( hwnd, 0 )) || old->format != fmt)
-    {
-        if (!(gl = create_gl_drawable( hwnd, fmt, FALSE )))
-        {
-            release_gl_drawable( old );
-            return FALSE;
-        }
-
-        TRACE( "created GL drawable %lx for win %p %s\n",
-               gl->drawable, hwnd, debugstr_fbconfig( fmt->fbconfig ));
+    if (!(gl = create_gl_drawable( hwnd, fmt, FALSE ))) return FALSE;
 
-        if (old)
-            mark_drawable_dirty( old, gl );
+    TRACE( "created GL drawable %lx for win %p %s\n",
+           gl->drawable, hwnd, debugstr_fbconfig( fmt->fbconfig ));
 
-        XFlush( gdi_display );
-        release_gl_drawable( gl );
-    }
+    XFlush( gdi_display );
+    release_gl_drawable( gl );
 
-    release_gl_drawable( old );
     return TRUE;
 }
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/8262