fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 20:18:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

wgl: Delete pixelformat support query

Browse source 
This whole thing was just a mess and never really worked the way it was
supposed to. All drivers can support GDI interop and double-buffering
independently at this point, so just remove it.

Fixes: c432fbe5 ("wgl: Add no-gdi-single-buffered and gdi-double-buffered PFDs")
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Reviewed-by: Jose Fonseca <jose.fonseca@broadcom.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29819>
(cherry picked from commit a02b759f41)
This commit is contained in:
Jesse Natalie 2024-06-20 09:25:27 -07:00 • committed by Eric Engestrom
parent 32e0363cd6
commit 2613580caf
6 changed files with 1 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -694,7 +694,7 @@
"description": "wgl: Delete pixelformat support query",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "c432fbe534d1b1d3874b612b97d8ed3fe97c8945",
"notes": null

6
src/gallium/frontends/wgl/stw_pixelformat.c
View file

@ -246,10 +246,6 @@ add_color_format_variants(const struct stw_pf_color_info *color_formats,
unsigned num_added = 0;
int force_samples = 0;
unsigned supported_flags = 0;
if (stw_dev->stw_winsys && stw_dev->stw_winsys->get_pfd_flags)
supported_flags = stw_dev->stw_winsys->get_pfd_flags(screen);
/* Since GLUT for Windows doesn't support MSAA we have an env var
* to force all pixel formats to have a particular number of samples.
*/
@ -298,8 +294,6 @@ add_color_format_variants(const struct stw_pf_color_info *color_formats,
for (f = 0; f < ARRAY_SIZE(stw_pf_flag); f++) {
stw_pfd_flag flag = stw_pf_flag[f];
if ((supported_flags & flag) != flag)
continue;
for (acc = 0; acc < 2; acc++) {
stw_pixelformat_add(stw_dev, extended, &color_formats[cfmt],
depth, acc * 16,

7
src/gallium/frontends/wgl/stw_winsys.h
View file

@ -124,13 +124,6 @@ struct stw_winsys
LPCRECT pRect,
ULONGLONG PresentHistoryToken );
/**
* Query whether the driver can support GDI and/or double-buffering in its
* pixel formats (optional).
*/
unsigned
(*get_pfd_flags)( struct pipe_screen *screen );
/**
* Create a winsys-specific object for a given DC's framebuffer
*/

12
src/gallium/targets/wgl/wgl.c
View file

@ -221,17 +221,6 @@ wgl_get_adapter_luid(struct pipe_screen* screen,
#endif
static unsigned
wgl_get_pfd_flags(struct pipe_screen *screen)
{
#ifdef GALLIUM_D3D12
if (use_d3d12)
return d3d12_wgl_get_pfd_flags(screen);
#endif
return stw_pfd_gdi_support;
}
static struct stw_winsys_framebuffer *
wgl_create_framebuffer(struct pipe_screen *screen,
HWND hWnd,
@ -262,7 +251,6 @@ static const struct stw_winsys stw_winsys = {
NULL, /* shared_surface_open */
NULL, /* shared_surface_close */
NULL, /* compose */
&wgl_get_pfd_flags,
&wgl_create_framebuffer,
&wgl_get_name,
};

3
src/gallium/winsys/d3d12/wgl/d3d12_wgl_public.h
View file

@ -45,9 +45,6 @@ d3d12_wgl_present(struct pipe_screen *screen,
struct pipe_resource *res,
HDC hDC);
unsigned
d3d12_wgl_get_pfd_flags(struct pipe_screen *screen);
struct stw_winsys_framebuffer *
d3d12_wgl_create_framebuffer(struct pipe_screen *screen,
HWND hWnd,

7
src/gallium/winsys/d3d12/wgl/d3d12_wgl_winsys.c
View file

@ -49,10 +49,3 @@ d3d12_wgl_present(struct pipe_screen *screen,
{
screen->flush_frontbuffer(screen, ctx, res, 0, 0, hDC, 0, NULL);
}
unsigned
d3d12_wgl_get_pfd_flags(struct pipe_screen *screen)
{
(void)screen;
return stw_pfd_gdi_support | stw_pfd_double_buffer;
}