From 24bc6c51e179116a8eba2c6b95ad98ef1c5313fd Mon Sep 17 00:00:00 2001
From: Yonggang Luo <luoyonggang@gmail.com>
Date: Sun, 20 Mar 2022 08:01:24 +0800
Subject: [PATCH] glx/egl: improve dri null screen related error messages.

Convert from `failed to create dri screen` to more exact error message
for easier debugging

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15480>
---
 src/egl/drivers/dri2/egl_dri2.c | 2 +-
 src/glx/dri2_glx.c              | 2 +-
 src/glx/dri3_glx.c              | 2 +-
 src/glx/drisw_glx.c             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index cf626c5b214..1353dfcf56f 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -1097,7 +1097,7 @@ dri2_create_screen(_EGLDisplay *disp)
    }
 
    if (dri2_dpy->dri_screen == NULL) {
-      _eglLog(_EGL_WARNING, "DRI2: failed to create dri screen");
+      _eglLog(_EGL_WARNING, "egl: failed to create dri2 screen");
       return EGL_FALSE;
    }
 
diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index 980f55d8a93..dab095a9f97 100644
--- a/src/glx/dri2_glx.c
+++ b/src/glx/dri2_glx.c
@@ -1229,7 +1229,7 @@ dri2CreateScreen(int screen, struct glx_display * priv)
    }
 
    if (psc->driScreen == NULL) {
-      ErrorMessageF("failed to create dri screen\n");
+      ErrorMessageF("glx: failed to create dri2 screen\n");
       goto handle_error;
    }
 
diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
index 1623a10ce44..4c1fea97a15 100644
--- a/src/glx/dri3_glx.c
+++ b/src/glx/dri3_glx.c
@@ -950,7 +950,7 @@ dri3_create_screen(int screen, struct glx_display * priv)
                                           &driver_configs, psc);
 
    if (psc->driScreen == NULL) {
-      ErrorMessageF("failed to create dri screen\n");
+      ErrorMessageF("glx: failed to create dri3 screen\n");
       goto handle_error;
    }
 
diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
index 0c863848b0e..2a4f89298bb 100644
--- a/src/glx/drisw_glx.c
+++ b/src/glx/drisw_glx.c
@@ -877,7 +877,7 @@ driswCreateScreen(int screen, struct glx_display *priv)
                                       &driver_configs, psc);
    }
    if (psc->driScreen == NULL) {
-      ErrorMessageF("failed to create dri screen\n");
+      ErrorMessageF("glx: failed to create drisw screen\n");
       goto handle_error;
    }