From b421abafbb427500f34a97afc6cd9840e6d83e63 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 25 Jul 2024 13:15:45 -0400 Subject: [PATCH] glx: inline DRI_INTEROP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák Reviewed-by: Adam Jackson Part-of: --- src/glx/dri_common_interop.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/glx/dri_common_interop.c b/src/glx/dri_common_interop.c index 7ec0452772a..685fded038f 100644 --- a/src/glx/dri_common_interop.c +++ b/src/glx/dri_common_interop.c @@ -27,6 +27,7 @@ #include "glx_error.h" #include "mesa_interface.h" #include "dri2_priv.h" +#include "dri_util.h" #if defined(HAVE_DRI3) #include "dri3_priv.h" #endif @@ -41,7 +42,7 @@ dri2_interop_query_device_info(struct glx_context *ctx, if (!psc->interop) return MESA_GLINTEROP_UNSUPPORTED; - return psc->interop->query_device_info(ctx->driContext, out); + return dri_interop_query_device_info(ctx->driContext, out); } _X_HIDDEN int @@ -54,7 +55,7 @@ dri2_interop_export_object(struct glx_context *ctx, if (!psc->interop) return MESA_GLINTEROP_UNSUPPORTED; - return psc->interop->export_object(ctx->driContext, in, out); + return dri_interop_export_object(ctx->driContext, in, out); } _X_HIDDEN int @@ -67,7 +68,7 @@ dri2_interop_flush_objects(struct glx_context *ctx, if (!psc->interop || psc->interop->base.version < 2) return MESA_GLINTEROP_UNSUPPORTED; - return psc->interop->flush_objects(ctx->driContext, count, objects, out); + return dri_interop_flush_objects(ctx->driContext, count, objects, out); } #if defined(HAVE_DRI3) @@ -81,7 +82,7 @@ dri3_interop_query_device_info(struct glx_context *ctx, if (!psc->interop) return MESA_GLINTEROP_UNSUPPORTED; - return psc->interop->query_device_info(ctx->driContext, out); + return dri_interop_query_device_info(ctx->driContext, out); } _X_HIDDEN int @@ -94,7 +95,7 @@ dri3_interop_export_object(struct glx_context *ctx, if (!psc->interop) return MESA_GLINTEROP_UNSUPPORTED; - return psc->interop->export_object(ctx->driContext, in, out); + return dri_interop_export_object(ctx->driContext, in, out); } _X_HIDDEN int @@ -107,7 +108,7 @@ dri3_interop_flush_objects(struct glx_context *ctx, if (!psc->interop || psc->interop->base.version < 2) return MESA_GLINTEROP_UNSUPPORTED; - return psc->interop->flush_objects(ctx->driContext, count, objects, out); + return dri_interop_flush_objects(ctx->driContext, count, objects, out); } #endif /* HAVE_DRI3 */