[PATCH v2 0/1] MR10914: win32u: Allow OpenGL context / HDC pixel format mismatch.

[Rémi Bernon (＠rbernon)]

This may happen if HDC is from a Pbuffer, and context was created
separately. Let's not be restrictive if host GL allows it.

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

--
  v2: win32u: Allow OpenGL context / HDC pixel format mismatch.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10914

[PATCH v2 1/1] win32u: Allow OpenGL context / HDC pixel format mismatch.

[Rémi Bernon]

From: Rémi Bernon <[e-mail]>

This may happen if HDC is from a Pbuffer, and context was created
separately. Let's not be restrictive if host GL allows it.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59555
---
 dlls/opengl32/tests/opengl.c | 4 ++--
 dlls/win32u/opengl.c         | 6 ------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c
index c9429d3d851..ed28698c281 100644
--- a/dlls/opengl32/tests/opengl.c
+++ b/dlls/opengl32/tests/opengl.c
@@ -3658,8 +3658,8 @@ static void test_framebuffer(void)
         ok_ret( TRUE, wglDeleteContext( ctx2 ) );
         ctx2 = ext.wglCreateContextAttribsARB( hdc2, ctx, NULL );
         ok_ptr( ctx2, !=, NULL );
-        ok_ret( FALSE, ext.wglMakeContextCurrentARB( hdc, hdc2, ctx2 ) );
-        ok_ret( ERROR_INVALID_PIXEL_FORMAT, LOWORD( GetLastError() ) );
+        todo_wine ok_ret( FALSE, ext.wglMakeContextCurrentARB( hdc, hdc2, ctx2 ) );
+        todo_wine ok_ret( ERROR_INVALID_PIXEL_FORMAT, LOWORD( GetLastError() ) );
     }
 
     ok_ret( TRUE, ext.wglMakeContextCurrentARB( hdc2, hdc2, ctx2 ) );
diff --git a/dlls/win32u/opengl.c b/dlls/win32u/opengl.c
index 3b8db3ca291..3d03b41fc24 100644
--- a/dlls/win32u/opengl.c
+++ b/dlls/win32u/opengl.c
@@ -1930,12 +1930,6 @@ static BOOL win32u_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, HGLRC c
         else RtlSetLastWin32Error( ERROR_INVALID_HANDLE );
         return FALSE;
     }
-    if (context->format != format)
-    {
-        WARN( "Mismatched draw_hdc %p format %u, context %p format %u\n", draw_hdc, format, context, context->format );
-        RtlSetLastWin32Error( ERROR_INVALID_PIXEL_FORMAT );
-        return FALSE;
-    }
 
     created = create_memory_pbuffer( draw_hdc );
     if (!context_sync_drawables( context, draw_hdc, read_hdc )) return FALSE;
-- 
GitLab

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

[Rémi Bernon (＠rbernon)]

Anything wrong with this?

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10914#note_140748