diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/egl/drivers/dri2/egl_dri2.c | 6 | ||||
-rw-r--r-- | src/egl/main/eglapi.c | 6 | ||||
-rw-r--r-- | src/egl/main/eglapi.h | 12 | ||||
-rw-r--r-- | src/gallium/state_trackers/dri/dri2.c | 6 | ||||
-rw-r--r-- | src/glx/dri2_priv.h | 6 | ||||
-rw-r--r-- | src/glx/dri3_priv.h | 6 | ||||
-rw-r--r-- | src/glx/dri_common_interop.c | 12 | ||||
-rw-r--r-- | src/glx/glxclient.h | 12 | ||||
-rw-r--r-- | src/glx/glxcmds.c | 6 |
9 files changed, 36 insertions, 36 deletions
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index f954cd53a34..bfde6400a5a 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -2690,7 +2690,7 @@ dri2_server_wait_sync(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSync *sync) static int dri2_interop_query_device_info(_EGLDisplay *dpy, _EGLContext *ctx, - mesa_glinterop_device_info *out) + struct mesa_glinterop_device_info *out) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(dpy); struct dri2_egl_context *dri2_ctx = dri2_egl_context(ctx); @@ -2703,8 +2703,8 @@ dri2_interop_query_device_info(_EGLDisplay *dpy, _EGLContext *ctx, static int dri2_interop_export_object(_EGLDisplay *dpy, _EGLContext *ctx, - mesa_glinterop_export_in *in, - mesa_glinterop_export_out *out) + struct mesa_glinterop_export_in *in, + struct mesa_glinterop_export_out *out) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(dpy); struct dri2_egl_context *dri2_ctx = dri2_egl_context(ctx); diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 098bed0518a..4700dbe42f6 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -1939,7 +1939,7 @@ _eglLockDisplayInterop(EGLDisplay dpy, EGLContext context, int MesaGLInteropEGLQueryDeviceInfo(EGLDisplay dpy, EGLContext context, - mesa_glinterop_device_info *out) + struct mesa_glinterop_device_info *out) { _EGLDisplay *disp; _EGLDriver *drv; @@ -1961,8 +1961,8 @@ MesaGLInteropEGLQueryDeviceInfo(EGLDisplay dpy, EGLContext context, int MesaGLInteropEGLExportObject(EGLDisplay dpy, EGLContext context, - mesa_glinterop_export_in *in, - mesa_glinterop_export_out *out) + struct mesa_glinterop_export_in *in, + struct mesa_glinterop_export_out *out) { _EGLDisplay *disp; _EGLDriver *drv; diff --git a/src/egl/main/eglapi.h b/src/egl/main/eglapi.h index 4df17c026d1..2d6a24fc59f 100644 --- a/src/egl/main/eglapi.h +++ b/src/egl/main/eglapi.h @@ -42,9 +42,9 @@ extern "C" { typedef void (*_EGLProc)(void); struct wl_display; -typedef struct _mesa_glinterop_device_info mesa_glinterop_device_info; -typedef struct _mesa_glinterop_export_in mesa_glinterop_export_in; -typedef struct _mesa_glinterop_export_out mesa_glinterop_export_out; +struct mesa_glinterop_device_info; +struct mesa_glinterop_export_in; +struct mesa_glinterop_export_out; /** * The API dispatcher jumps through these functions @@ -193,10 +193,10 @@ struct _egl_api EGLint *strides, EGLint *offsets); int (*GLInteropQueryDeviceInfo)(_EGLDisplay *dpy, _EGLContext *ctx, - mesa_glinterop_device_info *out); + struct mesa_glinterop_device_info *out); int (*GLInteropExportObject)(_EGLDisplay *dpy, _EGLContext *ctx, - mesa_glinterop_export_in *in, - mesa_glinterop_export_out *out); + struct mesa_glinterop_export_in *in, + struct mesa_glinterop_export_out *out); }; diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c index 8dea6715d7d..28f8078121d 100644 --- a/src/gallium/state_trackers/dri/dri2.c +++ b/src/gallium/state_trackers/dri/dri2.c @@ -1488,7 +1488,7 @@ static const __DRIrobustnessExtension dri2Robustness = { static int dri2_interop_query_device_info(__DRIcontext *_ctx, - mesa_glinterop_device_info *out) + struct mesa_glinterop_device_info *out) { struct pipe_screen *screen = dri_context(_ctx)->st->pipe->screen; @@ -1512,8 +1512,8 @@ dri2_interop_query_device_info(__DRIcontext *_ctx, static int dri2_interop_export_object(__DRIcontext *_ctx, - mesa_glinterop_export_in *in, - mesa_glinterop_export_out *out) + struct mesa_glinterop_export_in *in, + struct mesa_glinterop_export_out *out) { struct st_context_iface *st = dri_context(_ctx)->st; struct pipe_screen *screen = st->pipe->screen; diff --git a/src/glx/dri2_priv.h b/src/glx/dri2_priv.h index edba31e8fee..30ab2cdd871 100644 --- a/src/glx/dri2_priv.h +++ b/src/glx/dri2_priv.h @@ -72,12 +72,12 @@ dri2_query_renderer_string(struct glx_screen *base, int attribute, _X_HIDDEN int dri2_interop_query_device_info(struct glx_context *ctx, - mesa_glinterop_device_info *out); + struct mesa_glinterop_device_info *out); _X_HIDDEN int dri2_interop_export_object(struct glx_context *ctx, - mesa_glinterop_export_in *in, - mesa_glinterop_export_out *out); + struct mesa_glinterop_export_in *in, + struct mesa_glinterop_export_out *out); #ifdef __cplusplus } diff --git a/src/glx/dri3_priv.h b/src/glx/dri3_priv.h index 86ad17c4a51..082237781c8 100644 --- a/src/glx/dri3_priv.h +++ b/src/glx/dri3_priv.h @@ -135,9 +135,9 @@ dri3_query_renderer_string(struct glx_screen *base, int attribute, _X_HIDDEN int dri3_interop_query_device_info(struct glx_context *ctx, - mesa_glinterop_device_info *out); + struct mesa_glinterop_device_info *out); _X_HIDDEN int dri3_interop_export_object(struct glx_context *ctx, - mesa_glinterop_export_in *in, - mesa_glinterop_export_out *out); + struct mesa_glinterop_export_in *in, + struct mesa_glinterop_export_out *out); diff --git a/src/glx/dri_common_interop.c b/src/glx/dri_common_interop.c index 215aac46765..85538c63599 100644 --- a/src/glx/dri_common_interop.c +++ b/src/glx/dri_common_interop.c @@ -34,7 +34,7 @@ _X_HIDDEN int dri2_interop_query_device_info(struct glx_context *ctx, - mesa_glinterop_device_info *out) + struct mesa_glinterop_device_info *out) { struct dri2_screen *psc = (struct dri2_screen*)ctx->psc; struct dri2_context *drictx = (struct dri2_context*)ctx; @@ -47,8 +47,8 @@ dri2_interop_query_device_info(struct glx_context *ctx, _X_HIDDEN int dri2_interop_export_object(struct glx_context *ctx, - mesa_glinterop_export_in *in, - mesa_glinterop_export_out *out) + struct mesa_glinterop_export_in *in, + struct mesa_glinterop_export_out *out) { struct dri2_screen *psc = (struct dri2_screen*)ctx->psc; struct dri2_context *drictx = (struct dri2_context*)ctx; @@ -63,7 +63,7 @@ dri2_interop_export_object(struct glx_context *ctx, _X_HIDDEN int dri3_interop_query_device_info(struct glx_context *ctx, - mesa_glinterop_device_info *out) + struct mesa_glinterop_device_info *out) { struct dri3_screen *psc = (struct dri3_screen*)ctx->psc; struct dri3_context *drictx = (struct dri3_context*)ctx; @@ -76,8 +76,8 @@ dri3_interop_query_device_info(struct glx_context *ctx, _X_HIDDEN int dri3_interop_export_object(struct glx_context *ctx, - mesa_glinterop_export_in *in, - mesa_glinterop_export_out *out) + struct mesa_glinterop_export_in *in, + struct mesa_glinterop_export_out *out) { struct dri3_screen *psc = (struct dri3_screen*)ctx->psc; struct dri3_context *drictx = (struct dri3_context*)ctx; diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h index 7ffd4842e0c..ed57a296800 100644 --- a/src/glx/glxclient.h +++ b/src/glx/glxclient.h @@ -218,9 +218,9 @@ typedef struct __GLXattributeMachineRec __GLXattribute **stackPointer; } __GLXattributeMachine; -typedef struct _mesa_glinterop_device_info mesa_glinterop_device_info; -typedef struct _mesa_glinterop_export_in mesa_glinterop_export_in; -typedef struct _mesa_glinterop_export_out mesa_glinterop_export_out; +struct mesa_glinterop_device_info; +struct mesa_glinterop_export_in; +struct mesa_glinterop_export_out; struct glx_context_vtable { void (*destroy)(struct glx_context *ctx); @@ -237,10 +237,10 @@ struct glx_context_vtable { void (*release_tex_image)(Display * dpy, GLXDrawable drawable, int buffer); void * (*get_proc_address)(const char *symbol); int (*interop_query_device_info)(struct glx_context *ctx, - mesa_glinterop_device_info *out); + struct mesa_glinterop_device_info *out); int (*interop_export_object)(struct glx_context *ctx, - mesa_glinterop_export_in *in, - mesa_glinterop_export_out *out); + struct mesa_glinterop_export_in *in, + struct mesa_glinterop_export_out *out); }; /** diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c index 39b0fccc580..38b90594580 100644 --- a/src/glx/glxcmds.c +++ b/src/glx/glxcmds.c @@ -2697,7 +2697,7 @@ __glXGetUST(int64_t * ust) int MesaGLInteropGLXQueryDeviceInfo(Display *dpy, GLXContext context, - mesa_glinterop_device_info *out) + struct mesa_glinterop_device_info *out) { struct glx_context *gc = (struct glx_context*)context; int ret; @@ -2721,8 +2721,8 @@ MesaGLInteropGLXQueryDeviceInfo(Display *dpy, GLXContext context, int MesaGLInteropGLXExportObject(Display *dpy, GLXContext context, - mesa_glinterop_export_in *in, - mesa_glinterop_export_out *out) + struct mesa_glinterop_export_in *in, + struct mesa_glinterop_export_out *out) { struct glx_context *gc = (struct glx_context*)context; int ret; |