From b06e861dc8eb9afa5f97d27f7c681678d1c66174 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Thu, 1 Aug 2024 12:11:37 -0400
Subject: [PATCH] glx: unify dri get_driver_name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619>
---
 src/glx/dri2_glx.c   | 8 +-------
 src/glx/dri3_glx.c   | 8 +-------
 src/glx/dri_common.c | 6 ++++++
 src/glx/dri_common.h | 2 ++
 src/glx/drisw_glx.c  | 9 +--------
 5 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index 6bdab0ac080..b61f05064d5 100644
--- a/src/glx/dri2_glx.c
+++ b/src/glx/dri2_glx.c
@@ -657,18 +657,12 @@ static const struct glx_context_vtable dri2_context_vtable = {
    .wait_x              = dri2_wait_x,
 };
 
-static char *
-dri2_get_driver_name(struct glx_screen *glx_screen)
-{
-    return strdup(glx_screen->driverName);
-}
-
 static const struct glx_screen_vtable dri2_screen_vtable = {
    .create_context         = dri_common_create_context,
    .create_context_attribs = dri_create_context_attribs,
    .query_renderer_integer = glx_dri_query_renderer_integer,
    .query_renderer_string  = glx_dri_query_renderer_string,
-   .get_driver_name        = dri2_get_driver_name,
+   .get_driver_name        = dri_get_driver_name,
 };
 
 static const __DRIextension *loader_extensions[] = {
diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
index 6a16b11b318..8c9e512c2f0 100644
--- a/src/glx/dri3_glx.c
+++ b/src/glx/dri3_glx.c
@@ -496,18 +496,12 @@ static const struct glx_context_vtable dri3_context_vtable = {
    .wait_x              = dri3_wait_x,
 };
 
-static char *
-dri3_get_driver_name(struct glx_screen *glx_screen)
-{
-    return strdup(psc->base.driverName);
-}
-
 static const struct glx_screen_vtable dri3_screen_vtable = {
    .create_context         = dri_common_create_context,
    .create_context_attribs = dri_create_context_attribs,
    .query_renderer_integer = glx_dri_query_renderer_integer,
    .query_renderer_string  = glx_dri_query_renderer_string,
-   .get_driver_name        = dri3_get_driver_name,
+   .get_driver_name        = dri_get_driver_name,
 };
 
 /** dri3_create_screen
diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c
index e8eea5a30fc..3739003b11d 100644
--- a/src/glx/dri_common.c
+++ b/src/glx/dri_common.c
@@ -933,4 +933,10 @@ error_exit:
    return NULL;
 }
 
+char *
+dri_get_driver_name(struct glx_screen *glx_screen)
+{
+    return strdup(glx_screen->driverName);
+}
+
 #endif /* GLX_DIRECT_RENDERING */
diff --git a/src/glx/dri_common.h b/src/glx/dri_common.h
index 1c4af8384c4..68ff6b137c4 100644
--- a/src/glx/dri_common.h
+++ b/src/glx/dri_common.h
@@ -108,6 +108,8 @@ glx_dri_query_renderer_integer(struct glx_screen *base, int attribute,
 _X_HIDDEN int
 glx_dri_query_renderer_string(struct glx_screen *base, int attribute,
                            const char **value);
+char *
+dri_get_driver_name(struct glx_screen *glx_screen);
 #endif /* GLX_DIRECT_RENDERING */
 
 #endif /* _DRI_COMMON_H */
diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
index 0789858ddd1..1d48ca65314 100644
--- a/src/glx/drisw_glx.c
+++ b/src/glx/drisw_glx.c
@@ -589,19 +589,12 @@ driswDestroyScreen(struct glx_screen *base)
    free(psc);
 }
 
-static char *
-drisw_get_driver_name(struct glx_screen *glx_screen)
-{
-   struct drisw_screen *psc = (struct drisw_screen *) glx_screen;
-   return strdup(psc->base.driverName);
-}
-
 static const struct glx_screen_vtable drisw_screen_vtable = {
    .create_context         = dri_common_create_context,
    .create_context_attribs = dri_create_context_attribs,
    .query_renderer_integer = glx_dri_query_renderer_integer,
    .query_renderer_string  = glx_dri_query_renderer_string,
-   .get_driver_name        = drisw_get_driver_name,
+   .get_driver_name        = dri_get_driver_name,
 };
 
 static int