From 3698e103562a71a29db5931e3994e3eee7d0eecc Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Fri, 26 Jul 2024 09:27:11 -0400
Subject: [PATCH] gbm: inline DRI_CORE usage

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30472>
---
 src/gbm/backends/dri/gbm_dri.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c
index 9e6a6a54e41..1546eebd77d 100644
--- a/src/gbm/backends/dri/gbm_dri.c
+++ b/src/gbm/backends/dri/gbm_dri.c
@@ -306,7 +306,7 @@ dri_screen_create_for_driver(struct gbm_dri_device *dri, char *driver_name, bool
       goto fail;
 
    if (!swrast) {
-      extensions = dri->core->getExtensions(dri->screen);
+      extensions = driGetExtensions(dri->screen);
       if (!loader_bind_extensions(dri, dri_core_extensions,
                                   ARRAY_SIZE(dri_core_extensions),
                                   extensions)) {
@@ -319,7 +319,7 @@ dri_screen_create_for_driver(struct gbm_dri_device *dri, char *driver_name, bool
    return 0;
 
 free_screen:
-   dri->core->destroyScreen(dri->screen);
+   driDestroyScreen(dri->screen);
 
 fail:
    free(dri->driver_name);
@@ -1203,9 +1203,9 @@ dri_destroy(struct gbm_device *gbm)
    unsigned i;
 
    if (dri->context)
-      dri->core->destroyContext(dri->context);
+      driDestroyContext(dri->context);
 
-   dri->core->destroyScreen(dri->screen);
+   driDestroyScreen(dri->screen);
    for (i = 0; dri->driver_configs[i]; i++)
       free((__DRIconfig *) dri->driver_configs[i]);
    free(dri->driver_configs);