diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2016-04-21 17:29:16 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-05-24 23:03:00 +0100 |
| commit | e384d75b120ce60954c545e8c6edbe98fd01bea7 (patch) | |
| tree | 91f111db322fbfcb97ce308e0276558a507268e6 /src/glx | |
| parent | 0e983276b96eee5aa1dd091888bc81e36169a8f1 (diff) | |
mesa_glinterop: make GL interop version field bidirectional
This allows clear and easy communication between the two.
Caller: Requesting information (struct vN)
Callee: I know how to deal with older version (vN-1) only. Here is your
data and the version I support.
Caller: Older version ? Sure I'll cap all access to the fields provided
by the older version (vN-1)
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Tested-by: Tom Stellard <thomas.stellard@amd.com>
Diffstat (limited to 'src/glx')
| -rw-r--r-- | src/glx/dri2_priv.h | 2 | ||||
| -rw-r--r-- | src/glx/dri3_priv.h | 2 | ||||
| -rw-r--r-- | src/glx/dri_common_interop.c | 4 | ||||
| -rw-r--r-- | src/glx/glxclient.h | 2 | ||||
| -rw-r--r-- | src/glx/glxcmds.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/glx/dri2_priv.h b/src/glx/dri2_priv.h index 8a640728ec7..edba31e8fee 100644 --- a/src/glx/dri2_priv.h +++ b/src/glx/dri2_priv.h @@ -76,7 +76,7 @@ dri2_interop_query_device_info(struct glx_context *ctx, _X_HIDDEN int dri2_interop_export_object(struct glx_context *ctx, - const mesa_glinterop_export_in *in, + mesa_glinterop_export_in *in, mesa_glinterop_export_out *out); #ifdef __cplusplus diff --git a/src/glx/dri3_priv.h b/src/glx/dri3_priv.h index d4ecdf7a58e..86ad17c4a51 100644 --- a/src/glx/dri3_priv.h +++ b/src/glx/dri3_priv.h @@ -139,5 +139,5 @@ dri3_interop_query_device_info(struct glx_context *ctx, _X_HIDDEN int dri3_interop_export_object(struct glx_context *ctx, - const mesa_glinterop_export_in *in, + mesa_glinterop_export_in *in, mesa_glinterop_export_out *out); diff --git a/src/glx/dri_common_interop.c b/src/glx/dri_common_interop.c index 4733f3caab3..215aac46765 100644 --- a/src/glx/dri_common_interop.c +++ b/src/glx/dri_common_interop.c @@ -47,7 +47,7 @@ dri2_interop_query_device_info(struct glx_context *ctx, _X_HIDDEN int dri2_interop_export_object(struct glx_context *ctx, - const mesa_glinterop_export_in *in, + mesa_glinterop_export_in *in, mesa_glinterop_export_out *out) { struct dri2_screen *psc = (struct dri2_screen*)ctx->psc; @@ -76,7 +76,7 @@ dri3_interop_query_device_info(struct glx_context *ctx, _X_HIDDEN int dri3_interop_export_object(struct glx_context *ctx, - const mesa_glinterop_export_in *in, + mesa_glinterop_export_in *in, mesa_glinterop_export_out *out) { struct dri3_screen *psc = (struct dri3_screen*)ctx->psc; diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h index 141e46a31cd..16acd4b9d02 100644 --- a/src/glx/glxclient.h +++ b/src/glx/glxclient.h @@ -234,7 +234,7 @@ struct glx_context_vtable { int (*interop_query_device_info)(struct glx_context *ctx, mesa_glinterop_device_info *out); int (*interop_export_object)(struct glx_context *ctx, - const mesa_glinterop_export_in *in, + mesa_glinterop_export_in *in, mesa_glinterop_export_out *out); }; diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c index b651953cf9c..589a87a038c 100644 --- a/src/glx/glxcmds.c +++ b/src/glx/glxcmds.c @@ -2721,7 +2721,7 @@ MesaGLInteropGLXQueryDeviceInfo(Display *dpy, GLXContext context, int MesaGLInteropGLXExportObject(Display *dpy, GLXContext context, - const mesa_glinterop_export_in *in, + mesa_glinterop_export_in *in, mesa_glinterop_export_out *out) { struct glx_context *gc = (struct glx_context*)context; |