diff options
| author | Emil Velikov <[email protected]> | 2016-05-30 10:56:33 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-05-30 17:53:44 +0100 |
| commit | 13faddb6b8e30ff0e81e62fb863304a57c712aae (patch) | |
| tree | 5fada016ffe23c851a49c677d4f29c1b9e6017e1 /src/egl | |
| parent | d43c894471f2aff964ab5dbf75ee11826baae963 (diff) | |
mesa_glinterop: remove mesa_glinterop typedefs
As is there are two places that do the typedefs - dri_interface.h and
this header. As we cannot include the former in here, just drop the
typedefs and use the struct directly (as needed).
This is required because typedef redefinition is C11 feature which is
not supported on all the versions of GCC used to build mesa.
v2: Kill the typedef alltogether, as per Marek.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96236
Cc: Vinson Lee <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/egl')
| -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 |
3 files changed, 12 insertions, 12 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); }; |