File 0010-glx-silence-more-implicit-load-zink-errors... of Package Mesa

Overview Repositories Revisions Requests Users Attributes Meta

File 0010-glx-silence-more-implicit-load-zink-errors.patch of Package Mesa (Revision 9e383a41615f228bf166dc002b6430e1)

Currently displaying revision 9e383a41615f228bf166dc002b6430e1 , Show latest

From 5e99f24ee7d4aa9ff5178f63a79a8a313c32e44d Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
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.

Places

File 0010-glx-silence-more-implicit-load-zink-errors.patch of Package Mesa (Revision 9e383a41615f228bf166dc002b6430e1)

Places