fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 11:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

loader: Don't fall back to nouveau GL without zink
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
Long term, we don't want to support nouveau gl on new cards. Remove
the fallback so users without zink will get software rendering
instead of nouveau gl.

For now, NOUVEAU_USE_ZINK will still select nouveau gl on cards where
that is possible, but that isn't really supported and will likely be
removed for a lot of cards in the future.

Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36971>
This commit is contained in:
Mel Henning 2025-08-24 12:31:16 -04:00 • committed by Marge Bot
parent 8e1734d2f2
commit 265afd9bfd
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/loader/loader.c
View file

@ -143,12 +143,6 @@ nouveau_zink_predicate(int fd, const char *driver)
if (!drm_fd_is_nouveau(fd)) if (!drm_fd_is_nouveau(fd))
return false; return false;
#if !defined(HAVE_NVK) || !defined(HAVE_ZINK)
if (!strcmp(driver, "zink"))
return false;
return true;
#else
bool prefer_zink = false; bool prefer_zink = false;
bool require_zink = false; bool require_zink = false;
@ -197,7 +191,6 @@ nouveau_zink_predicate(int fd, const char *driver)
if (!use_zink && !strcmp(driver, "nouveau")) if (!use_zink && !strcmp(driver, "nouveau"))
return true; return true;
return false; return false;
#endif
} }