fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 11:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa/st, dri2, wgl, glx: Modify flush_objects interop func to export a fence_fd

Browse source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21305>
This commit is contained in:
Antonio Gomes 2023-10-24 17:31:15 -03:00 • committed by Marge Bot
parent 663cef26d0
commit 1396dc1c38
16 changed files with 45 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/GL/internal/dri_interface.h
View file

@ -462,7 +462,7 @@ struct __DRI2interopExtensionRec {
*/ */
int (*flush_objects)(__DRIcontext *ctx, int (*flush_objects)(__DRIcontext *ctx,
unsigned count, struct mesa_glinterop_export_in *objects, unsigned count, struct mesa_glinterop_export_in *objects,
GLsync *sync); GLsync *sync, int *fence_fd);
}; };

11
include/GL/mesa_glinterop.h
View file

@ -363,13 +363,14 @@ wglMesaGLInteropExportObject(HDC dpy, HGLRC context,
* \param count number of resources * \param count number of resources
* \param resources resources to flush * \param resources resources to flush
* \param sync optional GLsync to map to CL event * \param sync optional GLsync to map to CL event
* \param fence_fd optional fence_fd to use in CL
* *
* \return MESA_GLINTEROP_SUCCESS or MESA_GLINTEROP_* != 0 on error * \return MESA_GLINTEROP_SUCCESS or MESA_GLINTEROP_* != 0 on error
*/ */
int int
MesaGLInteropGLXFlushObjects(struct _XDisplay *dpy, struct __GLXcontextRec *context, MesaGLInteropGLXFlushObjects(struct _XDisplay *dpy, struct __GLXcontextRec *context,
unsigned count, struct mesa_glinterop_export_in *resources, unsigned count, struct mesa_glinterop_export_in *resources,
GLsync *sync); GLsync *sync, int *fence_fd);
/** /**
* Same as MesaGLInteropGLXFlushObjects except that it accepts * Same as MesaGLInteropGLXFlushObjects except that it accepts
@ -378,11 +379,11 @@ MesaGLInteropGLXFlushObjects(struct _XDisplay *dpy, struct __GLXcontextRec *cont
int int
MesaGLInteropEGLFlushObjects(EGLDisplay dpy, EGLContext context, MesaGLInteropEGLFlushObjects(EGLDisplay dpy, EGLContext context,
unsigned count, struct mesa_glinterop_export_in *resources, unsigned count, struct mesa_glinterop_export_in *resources,
GLsync *sync); GLsync *sync, int *fence_fd);
/** /**
* Same as MesaGLInteropGLXFlushObjects except that it accepts * Same as MesaGLInteropGLXFlushObjects except that it accepts
* HDC and HGLRC. * HDC and HGLRC, and not a fence_fd.
*/ */
int int
wglMesaGLInteropFlushObjects(HDC dpy, HGLRC context, wglMesaGLInteropFlushObjects(HDC dpy, HGLRC context,
@ -407,10 +408,10 @@ typedef int (*PFNWGLMESAGLINTEROPEXPORTOBJECTPROC)(HDC dpy, HGLRC context,
struct mesa_glinterop_export_out *out); struct mesa_glinterop_export_out *out);
typedef int (*PFNMESAGLINTEROPGLXFLUSHOBJECTSPROC)(struct _XDisplay *dpy, struct __GLXcontextRec *context, typedef int (*PFNMESAGLINTEROPGLXFLUSHOBJECTSPROC)(struct _XDisplay *dpy, struct __GLXcontextRec *context,
unsigned count, struct mesa_glinterop_export_in *resources, unsigned count, struct mesa_glinterop_export_in *resources,
GLsync *sync); GLsync *sync, int *fence_fd);
typedef int (*PFNMESAGLINTEROPEGLFLUSHOBJECTSPROC)(EGLDisplay dpy, EGLContext context, typedef int (*PFNMESAGLINTEROPEGLFLUSHOBJECTSPROC)(EGLDisplay dpy, EGLContext context,
unsigned count, struct mesa_glinterop_export_in *resources, unsigned count, struct mesa_glinterop_export_in *resources,
GLsync *sync); GLsync *sync, int *fence_fd);
typedef int (*PFNWGLMESAGLINTEROPFLUSHOBJECTSPROC)(HDC dpy, HGLRC context, typedef int (*PFNWGLMESAGLINTEROPFLUSHOBJECTSPROC)(HDC dpy, HGLRC context,
unsigned count, struct mesa_glinterop_export_in *resources, unsigned count, struct mesa_glinterop_export_in *resources,
GLsync *sync); GLsync *sync);

4
src/egl/drivers/dri2/egl_dri2.c
View file

@ -3664,7 +3664,7 @@ dri2_interop_export_object(_EGLDisplay *disp, _EGLContext *ctx,
static int static int
dri2_interop_flush_objects(_EGLDisplay *disp, _EGLContext *ctx, unsigned count, dri2_interop_flush_objects(_EGLDisplay *disp, _EGLContext *ctx, unsigned count,
struct mesa_glinterop_export_in *objects, struct mesa_glinterop_export_in *objects,
GLsync *sync) GLsync *sync, int *fence_fd)
{ {
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
struct dri2_egl_context *dri2_ctx = dri2_egl_context(ctx); struct dri2_egl_context *dri2_ctx = dri2_egl_context(ctx);
@ -3673,7 +3673,7 @@ dri2_interop_flush_objects(_EGLDisplay *disp, _EGLContext *ctx, unsigned count,
return MESA_GLINTEROP_UNSUPPORTED; return MESA_GLINTEROP_UNSUPPORTED;
return dri2_dpy->interop->flush_objects(dri2_ctx->dri_context, count, return dri2_dpy->interop->flush_objects(dri2_ctx->dri_context, count,
objects, sync); objects, sync, fence_fd);
} }
const _EGLDriver _eglDriver = { const _EGLDriver _eglDriver = {

2
src/egl/drivers/wgl/egl_wgl.c
View file

@ -1164,7 +1164,7 @@ wgl_interop_export_object(_EGLDisplay *disp, _EGLContext *ctx,
static int static int
wgl_interop_flush_objects(_EGLDisplay *disp, _EGLContext *ctx, unsigned count, wgl_interop_flush_objects(_EGLDisplay *disp, _EGLContext *ctx, unsigned count,
struct mesa_glinterop_export_in *objects, struct mesa_glinterop_export_in *objects,
GLsync *sync) GLsync *sync, int *fence_fd)
{ {
struct wgl_egl_context *wgl_ctx = wgl_egl_context(ctx); struct wgl_egl_context *wgl_ctx = wgl_egl_context(ctx);
return stw_interop_flush_objects(wgl_ctx->ctx, count, objects, sync); return stw_interop_flush_objects(wgl_ctx->ctx, count, objects, sync);

6
src/egl/main/eglapi.c
View file

@ -2899,7 +2899,7 @@ MesaGLInteropEGLExportObject(EGLDisplay dpy, EGLContext context,
PUBLIC int PUBLIC int
MesaGLInteropEGLFlushObjects(EGLDisplay dpy, EGLContext context, unsigned count, MesaGLInteropEGLFlushObjects(EGLDisplay dpy, EGLContext context, unsigned count,
struct mesa_glinterop_export_in *objects, struct mesa_glinterop_export_in *objects,
GLsync *sync) GLsync *sync, int *fence_fd)
{ {
_EGLDisplay *disp; _EGLDisplay *disp;
_EGLContext *ctx; _EGLContext *ctx;
@ -2910,8 +2910,8 @@ MesaGLInteropEGLFlushObjects(EGLDisplay dpy, EGLContext context, unsigned count,
return ret; return ret;
if (disp->Driver->GLInteropFlushObjects) if (disp->Driver->GLInteropFlushObjects)
ret = ret = disp->Driver->GLInteropFlushObjects(disp, ctx, count, objects, sync,
disp->Driver->GLInteropFlushObjects(disp, ctx, count, objects, sync); fence_fd);
else else
ret = MESA_GLINTEROP_UNSUPPORTED; ret = MESA_GLINTEROP_UNSUPPORTED;

2
src/egl/main/egldriver.h
View file

@ -208,7 +208,7 @@ struct _egl_driver {
int (*GLInteropFlushObjects)(_EGLDisplay *disp, _EGLContext *ctx, int (*GLInteropFlushObjects)(_EGLDisplay *disp, _EGLContext *ctx,
unsigned count, unsigned count,
struct mesa_glinterop_export_in *in, struct mesa_glinterop_export_in *in,
GLsync *sync); GLsync *sync, int *fence_fd);
/* for EGL_EXT_image_dma_buf_import_modifiers */ /* for EGL_EXT_image_dma_buf_import_modifiers */
EGLBoolean (*QueryDmaBufFormatsEXT)(_EGLDisplay *disp, EGLint max_formats, EGLBoolean (*QueryDmaBufFormatsEXT)(_EGLDisplay *disp, EGLint max_formats,

4
src/gallium/frontends/dri/dri2.c
View file

@ -2098,9 +2098,9 @@ dri2_interop_export_object(__DRIcontext *_ctx,
static int static int
dri2_interop_flush_objects(__DRIcontext *_ctx, dri2_interop_flush_objects(__DRIcontext *_ctx,
unsigned count, struct mesa_glinterop_export_in *objects, unsigned count, struct mesa_glinterop_export_in *objects,
GLsync *sync) GLsync *sync, int *fence_fd)
{ {
return st_interop_flush_objects(dri_context(_ctx)->st, count, objects, sync); return st_interop_flush_objects(dri_context(_ctx)->st, count, objects, sync, fence_fd);
} }
static const __DRI2interopExtension dri2InteropExtension = { static const __DRI2interopExtension dri2InteropExtension = {

2
src/gallium/frontends/wgl/stw_ext_interop.c
View file

@ -112,6 +112,6 @@ stw_interop_flush_objects(struct stw_context *ctx,
unsigned count, struct mesa_glinterop_export_in *objects, unsigned count, struct mesa_glinterop_export_in *objects,
GLsync *sync) GLsync *sync)
{ {
return st_interop_flush_objects(ctx->st, count, objects, sync); return st_interop_flush_objects(ctx->st, count, objects, sync, NULL);
} }

2
src/glx/dri2_priv.h
View file

@ -83,7 +83,7 @@ dri2_interop_export_object(struct glx_context *ctx,
_X_HIDDEN int _X_HIDDEN int
dri2_interop_flush_objects(struct glx_context *ctx, dri2_interop_flush_objects(struct glx_context *ctx,
unsigned count, struct mesa_glinterop_export_in *objects, unsigned count, struct mesa_glinterop_export_in *objects,
GLsync *sync); GLsync *sync, int *fence_fd);
#ifdef __cplusplus #ifdef __cplusplus
} }

2
src/glx/dri3_priv.h
View file

@ -143,4 +143,4 @@ dri3_interop_export_object(struct glx_context *ctx,
_X_HIDDEN int _X_HIDDEN int
dri3_interop_flush_objects(struct glx_context *ctx, dri3_interop_flush_objects(struct glx_context *ctx,
unsigned count, struct mesa_glinterop_export_in *objects, unsigned count, struct mesa_glinterop_export_in *objects,
GLsync *sync); GLsync *sync, int *fence_fd);

8
src/glx/dri_common_interop.c
View file

@ -60,14 +60,14 @@ dri2_interop_export_object(struct glx_context *ctx,
_X_HIDDEN int _X_HIDDEN int
dri2_interop_flush_objects(struct glx_context *ctx, dri2_interop_flush_objects(struct glx_context *ctx,
unsigned count, struct mesa_glinterop_export_in *objects, unsigned count, struct mesa_glinterop_export_in *objects,
GLsync *sync) GLsync *sync, int *fence_fd)
{ {
struct dri2_screen *psc = (struct dri2_screen*)ctx->psc; struct dri2_screen *psc = (struct dri2_screen*)ctx->psc;
if (!psc->interop || psc->interop->base.version < 2) if (!psc->interop || psc->interop->base.version < 2)
return MESA_GLINTEROP_UNSUPPORTED; return MESA_GLINTEROP_UNSUPPORTED;
return psc->interop->flush_objects(ctx->driContext, count, objects, sync); return psc->interop->flush_objects(ctx->driContext, count, objects, sync, fence_fd);
} }
#if defined(HAVE_DRI3) #if defined(HAVE_DRI3)
@ -100,14 +100,14 @@ dri3_interop_export_object(struct glx_context *ctx,
_X_HIDDEN int _X_HIDDEN int
dri3_interop_flush_objects(struct glx_context *ctx, dri3_interop_flush_objects(struct glx_context *ctx,
unsigned count, struct mesa_glinterop_export_in *objects, unsigned count, struct mesa_glinterop_export_in *objects,
GLsync *sync) GLsync *sync, int *fence_fd)
{ {
struct dri3_screen *psc = (struct dri3_screen*)ctx->psc; struct dri3_screen *psc = (struct dri3_screen*)ctx->psc;
if (!psc->interop || psc->interop->base.version < 2) if (!psc->interop || psc->interop->base.version < 2)
return MESA_GLINTEROP_UNSUPPORTED; return MESA_GLINTEROP_UNSUPPORTED;
return psc->interop->flush_objects(ctx->driContext, count, objects, sync); return psc->interop->flush_objects(ctx->driContext, count, objects, sync, fence_fd);
} }
#endif /* HAVE_DRI3 */ #endif /* HAVE_DRI3 */

4
src/glx/g_glxglvnddispatchfuncs.c
View file

@ -333,7 +333,7 @@ static int dispatch_GLInteropExportObjectMESA(Display *dpy, GLXContext ctx,
static int dispatch_GLInteropFlushObjectsMESA(Display *dpy, GLXContext ctx, static int dispatch_GLInteropFlushObjectsMESA(Display *dpy, GLXContext ctx,
unsigned count, unsigned count,
struct mesa_glinterop_export_in *resources, struct mesa_glinterop_export_in *resources,
GLsync *sync) GLsync *sync, int *fence_fd)
{ {
PFNMESAGLINTEROPGLXFLUSHOBJECTSPROC pGLInteropFlushObjectsMESA; PFNMESAGLINTEROPGLXFLUSHOBJECTSPROC pGLInteropFlushObjectsMESA;
__GLXvendorInfo *dd; __GLXvendorInfo *dd;
@ -346,7 +346,7 @@ static int dispatch_GLInteropFlushObjectsMESA(Display *dpy, GLXContext ctx,
if (pGLInteropFlushObjectsMESA == NULL) if (pGLInteropFlushObjectsMESA == NULL)
return 0; return 0;
return pGLInteropFlushObjectsMESA(dpy, ctx, count, resources, sync); return pGLInteropFlushObjectsMESA(dpy, ctx, count, resources, sync, fence_fd);
} }

2
src/glx/glxclient.h
View file

@ -222,7 +222,7 @@ struct glx_context_vtable {
struct mesa_glinterop_export_out *out); struct mesa_glinterop_export_out *out);
int (*interop_flush_objects)(struct glx_context *ctx, int (*interop_flush_objects)(struct glx_context *ctx,
unsigned count, struct mesa_glinterop_export_in *objects, unsigned count, struct mesa_glinterop_export_in *objects,
GLsync *sync); GLsync *sync, int *fence_fd);
}; };
/** /**

4
src/glx/glxcmds.c
View file

@ -2458,7 +2458,7 @@ PUBLIC int
MesaGLInteropGLXFlushObjects(Display *dpy, GLXContext context, MesaGLInteropGLXFlushObjects(Display *dpy, GLXContext context,
unsigned count, unsigned count,
struct mesa_glinterop_export_in *resources, struct mesa_glinterop_export_in *resources,
GLsync *sync) GLsync *sync, int *fence_fd)
{ {
struct glx_context *gc = (struct glx_context*)context; struct glx_context *gc = (struct glx_context*)context;
int ret; int ret;
@ -2475,7 +2475,7 @@ MesaGLInteropGLXFlushObjects(Display *dpy, GLXContext context,
return MESA_GLINTEROP_UNSUPPORTED; return MESA_GLINTEROP_UNSUPPORTED;
} }
ret = gc->vtable->interop_flush_objects(gc, count, resources, sync); ret = gc->vtable->interop_flush_objects(gc, count, resources, sync, fence_fd);
__glXUnlock(); __glXUnlock();
return ret; return ret;
} }

7
src/mesa/state_tracker/st_interop.c
View file

@ -25,6 +25,7 @@
#include "st_interop.h" #include "st_interop.h"
#include "st_cb_texture.h" #include "st_cb_texture.h"
#include "st_cb_flush.h"
#include "st_texture.h" #include "st_texture.h"
#include "bufferobj.h" #include "bufferobj.h"
@ -371,7 +372,7 @@ flush_object(struct gl_context *ctx,
int int
st_interop_flush_objects(struct st_context *st, st_interop_flush_objects(struct st_context *st,
unsigned count, struct mesa_glinterop_export_in *objects, unsigned count, struct mesa_glinterop_export_in *objects,
GLsync *sync) GLsync *sync, int *fence_fd)
{ {
struct gl_context *ctx = st->ctx; struct gl_context *ctx = st->ctx;
@ -393,6 +394,10 @@ st_interop_flush_objects(struct st_context *st,
if (count > 0 && sync) { if (count > 0 && sync) {
*sync = _mesa_fence_sync(ctx, GL_SYNC_GPU_COMMANDS_COMPLETE, 0); *sync = _mesa_fence_sync(ctx, GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
} else if (count > 0 && fence_fd) {
struct pipe_fence_handle *fence = NULL;
ctx->pipe->flush(ctx->pipe, &fence, PIPE_FLUSH_FENCE_FD | PIPE_FLUSH_ASYNC);
*fence_fd = ctx->screen->fence_get_fd(ctx->screen, fence);
} }
return MESA_GLINTEROP_SUCCESS; return MESA_GLINTEROP_SUCCESS;

2
src/mesa/state_tracker/st_interop.h
View file

@ -41,6 +41,6 @@ st_interop_export_object(struct st_context *st,
int int
st_interop_flush_objects(struct st_context *st, st_interop_flush_objects(struct st_context *st,
unsigned count, struct mesa_glinterop_export_in *objects, unsigned count, struct mesa_glinterop_export_in *objects,
GLsync *sync); GLsync *sync, int *fence_fd);
#endif /* ST_INTEROP_H */ #endif /* ST_INTEROP_H */