[PATCH v5 0/1] MR3111: opengl32: Implement filtering on all the ChoosePixelFormat() flags that are ignored when unset
When any of these flags: - PFD_DRAW_TO_WINDOW - PFD_DRAW_TO_BITMAP - PFD_SUPPORT_GDI - PFD_SUPPORT_OPENGL are set on the PIXELFORMATDESCRIPTOR parameter to ChoosePixelFormat(), the returned pixel format must also have them set, but when they are unset, the returned pixel format may or may not have them set. Also add support for filtering on all these flags. In particular, the lack of filtering on PFD_SUPPORT_GDI, was causing (at least) Java 1.3 to fail to initialize graphics, because we were returning a pixel format without the PFD_SUPPORT_GDI flag it asked for. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=7767 -- v5: opengl32: Implement filtering on all the ChoosePixelFormat() flags that are ignored when unset https://gitlab.winehq.org/wine/wine/-/merge_requests/3111
From: Damjan Jovanovic <damjan.jov(a)gmail.com> When any of these flags: - PFD_DRAW_TO_WINDOW - PFD_DRAW_TO_BITMAP - PFD_SUPPORT_GDI - PFD_SUPPORT_OPENGL are set on the PIXELFORMATDESCRIPTOR parameter to ChoosePixelFormat(), the returned pixel format must also have them set, but when they are unset, the returned pixel format may or may not have them set. Also add support for filtering on all these flags. In particular, the lack of filtering on PFD_SUPPORT_GDI, was causing (at least) Java 1.3 to fail to initialize graphics, because we were returning a pixel format without the PFD_SUPPORT_GDI flag it asked for. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=7767 --- dlls/opengl32/tests/opengl.c | 41 ++++++++++++++++++++++++++++++++++++ dlls/opengl32/wgl.c | 21 +++++++++++++++--- 2 files changed, 59 insertions(+), 3 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index ca66818c408..e3ca82a9b03 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -406,6 +406,43 @@ static void test_choosepixelformat(void) pfd.cDepthBits = 0; } +static void test_choosepixelformat_flag_is_ignored_when_unset(DWORD flag) +{ + PIXELFORMATDESCRIPTOR pfd = { + sizeof(PIXELFORMATDESCRIPTOR), + 1, /* version */ + flag, + PFD_TYPE_RGBA, + 0, /* color depth */ + 0, 0, 0, 0, 0, 0, /* color bits */ + 0, /* alpha buffer */ + 0, /* shift bit */ + 0, /* accumulation buffer */ + 0, 0, 0, 0, /* accum bits */ + 0, /* z-buffer */ + 0, /* stencil buffer */ + 0, /* auxiliary buffer */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0 /* layer masks */ + }; + PIXELFORMATDESCRIPTOR ret_fmt; + int set_idx; + int clear_idx; + + set_idx = test_pfd(&pfd, &ret_fmt); + if (set_idx > 0) + { + ok( ret_fmt.dwFlags & flag, "flag 0x%08lu not set\n", flag ); + /* now search for that pixel format with the flag cleared: */ + pfd = ret_fmt; + pfd.dwFlags &= ~flag; + clear_idx = test_pfd(&pfd, &ret_fmt); + ok( set_idx == clear_idx, "flag 0x%08lu matched different pixel formats when set vs cleared\n", flag ); + ok( ret_fmt.dwFlags & flag, "flag 0x%08lu not still set\n", flag ); + } else skip( "couldn't find a pixel format with flag 0x%08lu\n", flag ); +} + static void WINAPI gl_debug_message_callback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam) { @@ -2064,6 +2101,10 @@ START_TEST(opengl) } test_choosepixelformat(); + test_choosepixelformat_flag_is_ignored_when_unset(PFD_DRAW_TO_WINDOW); + test_choosepixelformat_flag_is_ignored_when_unset(PFD_DRAW_TO_BITMAP); + test_choosepixelformat_flag_is_ignored_when_unset(PFD_SUPPORT_GDI); + test_choosepixelformat_flag_is_ignored_when_unset(PFD_SUPPORT_OPENGL); test_wglChoosePixelFormatARB(hdc); test_debug_message_callback(); test_setpixelformat(hdc); diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index f57f7703409..b3cffa00a3e 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -145,10 +145,25 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) continue; } - /* only use bitmap capable for formats for bitmap rendering */ - if( (ppfd->dwFlags & PFD_DRAW_TO_BITMAP) != (format.dwFlags & PFD_DRAW_TO_BITMAP)) + if ((ppfd->dwFlags & PFD_DRAW_TO_BITMAP) && !(format.dwFlags & PFD_DRAW_TO_BITMAP)) { - TRACE( "PFD_DRAW_TO_BITMAP mismatch for iPixelFormat=%d\n", i ); + TRACE( "PFD_DRAW_TO_BITMAP required but not found for iPixelFormat=%d\n", i ); + continue; + } + if ((ppfd->dwFlags & PFD_DRAW_TO_WINDOW) && !(format.dwFlags & PFD_DRAW_TO_WINDOW)) + { + TRACE( "PFD_DRAW_TO_WINDOW required but not found for iPixelFormat=%d\n", i ); + continue; + } + + if ((ppfd->dwFlags & PFD_SUPPORT_GDI) && !(format.dwFlags & PFD_SUPPORT_GDI)) + { + TRACE( "PFD_SUPPORT_GDI required but not found for iPixelFormat=%d\n", i ); + continue; + } + if ((ppfd->dwFlags & PFD_SUPPORT_OPENGL) && !(format.dwFlags & PFD_SUPPORT_OPENGL)) + { + TRACE( "PFD_SUPPORT_OPENGL required but not found for iPixelFormat=%d\n", i ); continue; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3111
participants (2)
-
Damjan Jovanovic -
Damjan Jovanovic (＠dj)