aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2016-04-21 17:16:49 +0100
committerEmil Velikov <[email protected]>2016-05-24 23:03:00 +0100
commit0e983276b96eee5aa1dd091888bc81e36169a8f1 (patch)
tree90f0ee5228956adeed8c890a1d8cf3e3dbec220d
parentf8a114aa5c1141c1a5e4052deeeafd164fb5f1ef (diff)
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 <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Tested-by: Tom Stellard <[email protected]>
-rw-r--r--include/GL/mesa_glinterop.h9
-rw-r--r--src/gallium/state_trackers/dri/dri2.c2
2 files changed, 0 insertions, 11 deletions
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;
}