diff --git a/0010-glx-silence-more-implicit-load-zink-errors.patch b/0010-glx-silence-more-implicit-load-zink-errors.patch new file mode 100644 index 0000000..82e2a44 --- /dev/null +++ b/0010-glx-silence-more-implicit-load-zink-errors.patch @@ -0,0 +1,50 @@ +From 5e99f24ee7d4aa9ff5178f63a79a8a313c32e44d Mon Sep 17 00:00:00 2001 +From: Mike Blumenkrantz +Date: Tue, 19 Mar 2024 08:37:47 -0400 +Subject: [PATCH] glx: silence more implicit-load zink errors + +--- + src/glx/drisw_glx.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +Index: mesa-24.0.3/src/glx/drisw_glx.c +=================================================================== +--- mesa-24.0.3.orig/src/glx/drisw_glx.c ++++ mesa-24.0.3/src/glx/drisw_glx.c +@@ -980,7 +980,8 @@ driswCreateScreenDriver(int screen, stru + extensions, + &driver_configs, implicit, psc); + if (psc->driScreen == NULL) { +- ErrorMessageF("glx: failed to create drisw screen\n"); ++ if (!pdpyp->zink || !implicit) ++ ErrorMessageF("glx: failed to create drisw screen\n"); + goto handle_error; + } + +@@ -1049,7 +1050,8 @@ driswCreateScreenDriver(int screen, stru + glx_screen_cleanup(&psc->base); + free(psc); + +- CriticalErrorMessageF("failed to load driver: %s\n", driver); ++ if (pdpyp->zink == TRY_ZINK_YES && !implicit) ++ CriticalErrorMessageF("failed to load driver: %s\n", driver); + + return NULL; + } +Index: mesa-24.0.3/src/glx/glxclient.h +=================================================================== +--- mesa-24.0.3.orig/src/glx/glxclient.h ++++ mesa-24.0.3/src/glx/glxclient.h +@@ -133,6 +133,12 @@ struct __GLXDRIdrawableRec + int refcount; + }; + ++enum try_zink { ++ TRY_ZINK_NO, ++ TRY_ZINK_INFER, ++ TRY_ZINK_YES, ++}; ++ + /* + ** Function to create and DRI display data and initialize the display + ** dependent methods. diff --git a/Mesa.changes b/Mesa.changes index 3a18c89..cb5edb2 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 19 12:59:16 UTC 2024 - Stefan Dirsch + +- 0010-glx-silence-more-implicit-load-zink-errors.patch + * glx: silence more implicit-load zink errors [gitlab mesa issue #10802] + ------------------------------------------------------------------- Tue Mar 19 02:20:03 UTC 2024 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index 4b6c07f..5a32bc5 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -156,6 +156,7 @@ Patch506: 0006-gbm-plumb-an-implicit-param-through-device-creation.patch Patch507: 0007-frontends-dri-plumb-an-implicit-param-through-screen.patch Patch508: 0008-pipe-loader-plumb-a-flag-for-implicit-driver-load-th.patch Patch509: 0009-zink-don-t-print-error-messages-when-failing-an-impl.patch +Patch510: 0010-glx-silence-more-implicit-load-zink-errors.patch %ifarch %{ix86} x86_64 BuildRequires: DirectX-Headers %endif @@ -786,6 +787,7 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch -P 507 -p1 %patch -P 508 -p1 %patch -P 509 -p1 +%patch -P 510 -p1 # Remove requires to vulkan libs from baselibs.conf on platforms # where vulkan build is disabled; ugly ...