From: Emil Velikov <[email protected]> One cannot use a single version to control both export_in and export_out versions. Using this forces us to always extend/bump both structs at the same time.
An alternative scheme is coming with next patch. Signed-off-by: Emil Velikov <[email protected]> --- If people think that the proposed solution is fragile/nasty/etc. can we have separate version fields in this struct ? --- include/GL/mesa_glinterop.h | 9 --------- src/gallium/state_trackers/dri/dri2.c | 2 -- 2 files changed, 11 deletions(-) diff --git a/include/GL/mesa_glinterop.h b/include/GL/mesa_glinterop.h index ff3235e..0a22b9b 100644 --- a/include/GL/mesa_glinterop.h +++ b/include/GL/mesa_glinterop.h @@ -107,15 +107,6 @@ typedef struct _mesa_glinterop_device_info { uint32_t vendor_id; uint32_t device_id; - /* The interop version determines what behavior the caller should expect - * out of all functions. - * - * Interop version 1: - * - mesa_glinterop_export_in is not read beyond "out_driver_data" - * - mesa_glinterop_export_out is not written beyond "out_driver_data_written" - * - mesa_glinterop_device_info is not written beyond "interop_version" - */ - uint32_t interop_version; /* Structure version 1 ends here. */ } mesa_glinterop_device_info; diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c index 15e3443..3a2a3ce 100644 --- a/src/gallium/state_trackers/dri/dri2.c +++ b/src/gallium/state_trackers/dri/dri2.c @@ -1480,8 +1480,6 @@ dri2_interop_query_device_info(__DRIcontext *_ctx, out->vendor_id = screen->get_param(screen, PIPE_CAP_VENDOR_ID); out->device_id = screen->get_param(screen, PIPE_CAP_DEVICE_ID); - out->interop_version = 1; - return MESA_GLINTEROP_SUCCESS; } -- 2.8.2 _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
