From: Emil Velikov Date: Thu, 21 Apr 2016 16:16:49 +0000 (+0100) Subject: mesa_glinterop: drop mesa_glinterop_device_info::interop_version X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0e983276b96eee5aa1dd091888bc81e36169a8f1;p=mesa.git mesa_glinterop: drop mesa_glinterop_device_info::interop_version 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 Reviewed-by: Marek Olšák Tested-by: Tom Stellard --- diff --git a/include/GL/mesa_glinterop.h b/include/GL/mesa_glinterop.h index ff3235e958a..0a22b9be321 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 15e34431881..3a2a3cedc5a 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; }