fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 11:08:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

wgl: Add a loop for screen creation with an ordered list of fallbacks

Browse source 
Fixes: 8955980f ("gallium/targets/libgl-gdi: prefer d3d12 driver")
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Tested-by: Prodea Alexandru-Liviu <liviuprodea@yahoo.com>
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4022
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8865>
(cherry picked from commit f66b0c7303)
This commit is contained in:
Jesse Natalie 2021-02-04 08:08:12 -08:00 • committed by Dylan Baker
parent 83f99bbb4f
commit aa7a38dd44
2 changed files with 28 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -3280,7 +3280,7 @@
"description": "wgl: Add a loop for screen creation with an ordered list of fallbacks",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "8955980f17f902d24c50962502a20285dcd11642"
},

46
src/gallium/targets/libgl-gdi/libgl_gdi.c
View file

@ -123,33 +123,41 @@ gdi_screen_create_by_name(HDC hDC, const char* driver, struct sw_winsys *winsys)
static struct pipe_screen *
gdi_screen_create(HDC hDC)
{
const char *default_driver;
const char *driver;
struct pipe_screen *screen = NULL;
struct sw_winsys *winsys;
winsys = gdi_create_sw_winsys();
if (!winsys)
return screen;
return NULL;
const char *const drivers[] = {
debug_get_option("GALLIUM_DRIVER", ""),
#ifdef GALLIUM_D3D12
default_driver = "d3d12";
#elif defined(GALLIUM_LLVMPIPE)
default_driver = "llvmpipe";
#elif GALLIUM_SWR
default_driver = "swr";
#elif defined(GALLIUM_SOFTPIPE)
default_driver = "softpipe";
#else
#error "no suitable default-driver"
"d3d12",
#endif
#if defined(GALLIUM_LLVMPIPE)
"llvmpipe",
#endif
#if GALLIUM_SWR
"swr",
#endif
#if defined(GALLIUM_SOFTPIPE)
"softpipe",
#endif
};
/* If the default driver screen creation fails, fall back to the next option in the
* sorted list. Don't do this if GALLIUM_DRIVER is specified.
*/
for (unsigned i = 0; i < ARRAY_SIZE(drivers); ++i) {
struct pipe_screen* screen = gdi_screen_create_by_name(hDC, drivers[i], winsys);
if (screen)
return screen;
if (i == 0 && drivers[i][0] != '\0')
break;
}
driver = debug_get_option("GALLIUM_DRIVER", default_driver);
screen = gdi_screen_create_by_name(hDC, driver, winsys);
if (!screen)
winsys->destroy(winsys);
return screen;
winsys->destroy(winsys);
return NULL;
}