[PATCH 0/1] MR9699: win32u: Expose onscreen single buffer formats with PFD_SUPPORT_GDI.

[Rémi Bernon]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59053

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

[PATCH 1/1] win32u: Expose onscreen single buffer formats with PFD_SUPPORT_GDI.

[Rémi Bernon]

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

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59053
---
 dlls/win32u/opengl.c          | 35 ++++++++++++++++++-----------------
 dlls/wineandroid.drv/opengl.c |  6 ++----
 dlls/winewayland.drv/opengl.c |  4 +---
 dlls/winex11.drv/opengl.c     |  4 +---
 4 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/dlls/win32u/opengl.c b/dlls/win32u/opengl.c
index 0d4889c0a87..e770c0f7d3f 100644
--- a/dlls/win32u/opengl.c
+++ b/dlls/win32u/opengl.c
@@ -432,11 +432,9 @@ static struct opengl_drawable *framebuffer_surface_create( int format, struct cl
 
 static const struct opengl_drawable_funcs egldrv_pbuffer_funcs;
 
-static inline EGLConfig egl_config_for_format( const struct egl_platform *egl, int format )
+static EGLConfig egl_config_for_format( const struct egl_platform *egl, int format )
 {
-    assert(format > 0 && format <= 2 * egl->config_count);
-    if (format <= egl->config_count) return egl->configs[format - 1];
-    return egl->configs[format - egl->config_count - 1];
+    return egl->configs[(format - 1) % egl->config_count];
 }
 
 static void egldrv_init_egl_platform( struct egl_platform *platform )
@@ -450,6 +448,14 @@ static void *egldrv_get_proc_address( const char *name )
     return display_funcs.p_eglGetProcAddress( name );
 }
 
+/* list of flags with which each EGL config will be combined */
+static const UINT pixel_format_flags[] =
+{
+    PFD_SUPPORT_GDI,
+    PFD_DOUBLEBUFFER,
+    0, /* offscreen */
+};
+
 static UINT egldrv_init_pixel_formats( UINT *onscreen_count )
 {
     const struct opengl_funcs *funcs = &display_funcs;
@@ -494,11 +500,12 @@ static UINT egldrv_init_pixel_formats( UINT *onscreen_count )
 
     egl->configs = configs;
     egl->config_count = count;
-    *onscreen_count = count;
-    return 2 * count;
+
+    *onscreen_count = (ARRAY_SIZE(pixel_format_flags) - 1) * count;
+    return ARRAY_SIZE(pixel_format_flags) * count;
 }
 
-static BOOL describe_egl_config( EGLConfig config, struct wgl_pixel_format *fmt, BOOL onscreen )
+static BOOL describe_egl_config( EGLConfig config, struct wgl_pixel_format *fmt, UINT flags )
 {
     const struct opengl_funcs *funcs = &display_funcs;
     struct egl_platform *egl = &display_egl;
@@ -512,12 +519,8 @@ static BOOL describe_egl_config( EGLConfig config, struct wgl_pixel_format *fmt,
     memset( fmt, 0, sizeof(*fmt) );
     pfd->nSize = sizeof(*pfd);
     pfd->nVersion = 1;
-    pfd->dwFlags = PFD_SUPPORT_OPENGL | PFD_SUPPORT_COMPOSITION;
-    if (onscreen)
-    {
-        pfd->dwFlags |= PFD_DOUBLEBUFFER;
-        if (surface_type & EGL_WINDOW_BIT) pfd->dwFlags |= PFD_DRAW_TO_WINDOW;
-    }
+    pfd->dwFlags = PFD_SUPPORT_OPENGL | PFD_SUPPORT_COMPOSITION | flags;
+    if (flags && surface_type & EGL_WINDOW_BIT) pfd->dwFlags |= PFD_DRAW_TO_WINDOW;
     pfd->iPixelType = PFD_TYPE_RGBA;
     pfd->iLayerType = PFD_MAIN_PLANE;
 
@@ -637,11 +640,9 @@ static BOOL egldrv_describe_pixel_format( int format, struct wgl_pixel_format *d
 {
     struct egl_platform *egl = &display_egl;
     int count = egl->config_count;
-    BOOL onscreen = TRUE;
 
-    if (--format < 0 || format > 2 * count) return FALSE;
-    if (format >= count) onscreen = FALSE;
-    return describe_egl_config( egl->configs[format % count], desc, onscreen );
+    if (--format < 0 || format > ARRAY_SIZE(pixel_format_flags) * count) return FALSE;
+    return describe_egl_config( egl->configs[format % count], desc, pixel_format_flags[format / count] );
 }
 
 static const char *egldrv_init_wgl_extensions( struct opengl_funcs *funcs )
diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c
index 377d5b2d5ea..1efd312b940 100644
--- a/dlls/wineandroid.drv/opengl.c
+++ b/dlls/wineandroid.drv/opengl.c
@@ -64,11 +64,9 @@ static struct gl_drawable *impl_from_opengl_drawable( struct opengl_drawable *ba
 
 static void *opengl_handle;
 
-static inline EGLConfig egl_config_for_format(int format)
+static EGLConfig egl_config_for_format(int format)
 {
-    assert(format > 0 && format <= 2 * egl->config_count);
-    if (format <= egl->config_count) return egl->configs[format - 1];
-    return egl->configs[format - egl->config_count - 1];
+    return egl->configs[(format - 1) % egl->config_count];
 }
 
 static void android_drawable_destroy( struct opengl_drawable *base )
diff --git a/dlls/winewayland.drv/opengl.c b/dlls/winewayland.drv/opengl.c
index 22bd2541581..9a4b14ec7d9 100644
--- a/dlls/winewayland.drv/opengl.c
+++ b/dlls/winewayland.drv/opengl.c
@@ -65,9 +65,7 @@ static void wayland_drawable_destroy(struct opengl_drawable *base)
 
 static EGLConfig egl_config_for_format(int format)
 {
-    assert(format > 0 && format <= 2 * egl->config_count);
-    if (format <= egl->config_count) return egl->configs[format - 1];
-    return egl->configs[format - egl->config_count - 1];
+    return egl->configs[(format - 1) % egl->config_count];
 }
 
 static void wayland_gl_drawable_sync_size(struct wayland_gl_drawable *gl)
diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index e945b14b3b1..90f09b48c10 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -473,9 +473,7 @@ static void x11drv_init_egl_platform( struct egl_platform *platform )
 
 static EGLConfig egl_config_for_format( int format )
 {
-    assert(format > 0 && format <= 2 * egl->config_count);
-    if (format <= egl->config_count) return egl->configs[format - 1];
-    return egl->configs[format - egl->config_count - 1];
+    return egl->configs[(format - 1) % egl->config_count];
 }
 
 static struct glx_pixel_format *glx_pixel_format_from_format( int format )
-- 
GitLab

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