[PATCH 0/2] MR6164: Draft: opengl32: Fix wglChoosePixelFormatARB support for pbuffer.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56984 Fixes: 272c55ac257315ef8393df357a79aac4e0d6cd76 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6164
From: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/winex11.drv/opengl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 5d914b74f0a..e68bdd59ddb 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1528,7 +1528,7 @@ static int describe_pixel_format( int iPixelFormat, struct wgl_pixel_format *pf pf->framebuffer_srgb_capable = value; pf->bind_to_texture_rgb = pf->bind_to_texture_rgba = - use_render_texture_emulation && render_type != GLX_COLOR_INDEX_BIT && (render_type & GLX_PBUFFER_BIT); + use_render_texture_emulation && render_type != GLX_COLOR_INDEX_BIT && (drawable_type & GLX_PBUFFER_BIT); pf->bind_to_texture_rectangle_rgb = pf->bind_to_texture_rectangle_rgba = GL_FALSE; if (pglXGetFBConfigAttrib( gdi_display, fmt->fbconfig, GLX_FLOAT_COMPONENTS_NV, &value )) value = -1; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6164
From: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56984 Fixes: 272c55ac257315ef8393df357a79aac4e0d6cd76 --- dlls/opengl32/wgl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index b4daa642348..6e24e4d5ed1 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -520,6 +520,7 @@ static enum attrib_match wgl_attrib_match_criteria( int attrib ) case WGL_DOUBLE_BUFFER_ARB: case WGL_STEREO_ARB: case WGL_PIXEL_TYPE_ARB: + case WGL_DRAW_TO_PBUFFER_ARB: case WGL_BIND_TO_TEXTURE_RGB_ARB: case WGL_BIND_TO_TEXTURE_RGBA_ARB: case WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV: -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6164
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=147380 Your paranoid android. === debian11b (64 bit WoW report) === user32: input.c:4305: Test succeeded inside todo block: button_down_hwnd_todo 1: got MSG_TEST_WIN hwnd 00000000034F00F0, msg WM_LBUTTONDOWN, wparam 0x1, lparam 0x320032
Marking as draft until solution verified by bug reporter. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6164#note_77177
On Sun Jul 28 10:38:23 2024 +0000, Alexandros Frantzis wrote:
Marking as draft until solution verified by bug reporter. The fix has been verified in https://bugs.winehq.org/show_bug.cgi?id=56984
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/6164#note_77214
participants (3)
-
Alexandros Frantzis -
Alexandros Frantzis (＠afrantzis)
-
Marvin