KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drisw: move zink down the list below the sw drivers. 

We don't ever want drisw path picking zink as the driver,
we can revisit this when the penny wrapper work gets further
along.

This selection causes systems with nvidia/intel dual-gpus
to try and pick the intel gpu for rendering in the nvidia
context if there is no nvidia GL driver or accel doesn't work.

This is a partial revert of the original commit.

Fixes: 4a3b42a717 ("drisw: Prefer hardware-layered sw-winsys drivers over pure sw")
Acked-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Acked-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9816>
This commit is contained in:
Dave Airlie 2021-03-25 08:34:28 +10:00 committed by Marge Bot
parent 57511d1458
commit 3e1698fe1b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gallium/auxiliary/target-helpers/inline_sw_helper.h
View File

@ -81,9 +81,6 @@ sw_screen_create(struct sw_winsys *winsys)
UNUSED bool only_sw = env_var_as_boolean("LIBGL_ALWAYS_SOFTWARE", false);
const char *drivers[] = {
debug_get_option("GALLIUM_DRIVER", ""),
#if defined(GALLIUM_ZINK)
only_sw ? "" : "zink",
#endif
#if defined(GALLIUM_D3D12)
only_sw ? "" : "d3d12",
#endif
@ -95,6 +92,9 @@ sw_screen_create(struct sw_winsys *winsys)
#endif
#if defined(GALLIUM_SWR)
"swr",
#endif
#if defined(GALLIUM_ZINK)
only_sw ? "" : "zink",
#endif
};

6
src/gallium/auxiliary/target-helpers/sw_helper.h
View File

@ -86,9 +86,6 @@ sw_screen_create(struct sw_winsys *winsys)
UNUSED bool only_sw = env_var_as_boolean("LIBGL_ALWAYS_SOFTWARE", false);
const char *drivers[] = {
debug_get_option("GALLIUM_DRIVER", ""),
#if defined(GALLIUM_ZINK)
only_sw ? "" : "zink",
#endif
#if defined(GALLIUM_D3D12)
only_sw ? "" : "d3d12",
#endif
@ -100,6 +97,9 @@ sw_screen_create(struct sw_winsys *winsys)
#endif
#if defined(GALLIUM_SWR)
"swr",
#endif
#if defined(GALLIUM_ZINK)
only_sw ? "" : "zink",
#endif
};