mesa/st: directly call the uuid get funcs.

Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14632>

diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
index b3a0e65..0f488b3 100644 (file)
--- a/src/mesa/main/version.c
+++ b/src/mesa/main/version.c
@@ -709,13 +709,19 @@ done:
 void
 _mesa_get_driver_uuid(struct gl_context *ctx, GLint *uuid)
 {
-   st_get_driver_uuid(ctx, (char*) uuid);
+   struct pipe_screen *screen = ctx->pipe->screen;
+   assert(GL_UUID_SIZE_EXT >= PIPE_UUID_SIZE);
+   memset(uuid, 0, GL_UUID_SIZE_EXT);
+   screen->get_driver_uuid(screen, (char *)uuid);
 }
 
 void
 _mesa_get_device_uuid(struct gl_context *ctx, GLint *uuid)
 {
-   st_get_device_uuid(ctx, (char*) uuid);
+   struct pipe_screen *screen = ctx->pipe->screen;
+   assert(GL_UUID_SIZE_EXT >= PIPE_UUID_SIZE);
+   memset(uuid, 0, GL_UUID_SIZE_EXT);
+   screen->get_device_uuid(screen, (char *)uuid);
 }
 
 /**

diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 71c9bf4..c8916f6 100644 (file)
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -831,29 +831,6 @@ st_set_background_context(struct gl_context *ctx,
    smapi->set_background_context(&st->iface, queue_info);
 }
 
-
-void
-st_get_device_uuid(struct gl_context *ctx, char *uuid)
-{
-   struct pipe_screen *screen = st_context(ctx)->screen;
-
-   assert(GL_UUID_SIZE_EXT >= PIPE_UUID_SIZE);
-   memset(uuid, 0, GL_UUID_SIZE_EXT);
-   screen->get_device_uuid(screen, uuid);
-}
-
-
-void
-st_get_driver_uuid(struct gl_context *ctx, char *uuid)
-{
-   struct pipe_screen *screen = st_context(ctx)->screen;
-
-   assert(GL_UUID_SIZE_EXT >= PIPE_UUID_SIZE);
-   memset(uuid, 0, GL_UUID_SIZE_EXT);
-   screen->get_driver_uuid(screen, uuid);
-}
-
-
 static void
 st_pin_driver_to_l3_cache(struct gl_context *ctx, unsigned L3_cache)
 {

diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index dadb780..fbbd1bc 100644 (file)
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -453,8 +453,6 @@ struct st_framebuffer
 void st_query_memory_info(struct gl_context *ctx, struct gl_memory_info *out);
 
 void st_invalidate_state(struct gl_context *ctx);
-void st_get_driver_uuid(struct gl_context *ctx, char *uuid);
-void st_get_device_uuid(struct gl_context *ctx, char *uuid);
 void st_set_background_context(struct gl_context *ctx,
                                struct util_queue_monitoring *queue_info);
 #ifdef __cplusplus