summaryrefslogtreecommitdiffstats
path: root/include/GL/internal/dri_interface.h
diff options
context:
space:
mode:
authorTapani Pälli <[email protected]>2019-11-12 17:33:08 +0200
committerTapani Pälli <[email protected]>2019-11-14 07:46:36 +0200
commit1a093a06d6b7f33b4edb621c8d1920ff69dff630 (patch)
tree63e5afc34df0cd9815bda8c47b790bdba79bb079 /include/GL/internal/dri_interface.h
parent7951eb146c1bb57c6d2231a9675046c535530b6a (diff)
Revert "dri_interface: add interface for EGL_EXT_image_flush_external"
This reverts commit 7520478461d8ab1cda415ff689d6b9058213ff43. This series caused unexpected flickering artifacts with Iris driver on Chrome OS and EGL_EXT_image_flush_external spec has not been published yet. Acked-by: Eric Engestrom <[email protected]> Acked-by: Kristian H. Kristensen <[email protected]>
Diffstat (limited to 'include/GL/internal/dri_interface.h')
-rw-r--r--include/GL/internal/dri_interface.h51
1 files changed, 1 insertions, 50 deletions
diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h
index c1d54a1a9c6..f19ec5168a5 100644
--- a/include/GL/internal/dri_interface.h
+++ b/include/GL/internal/dri_interface.h
@@ -1306,7 +1306,7 @@ struct __DRIdri2ExtensionRec {
* extensions.
*/
#define __DRI_IMAGE "DRI_IMAGE"
-#define __DRI_IMAGE_VERSION 18
+#define __DRI_IMAGE_VERSION 17
/**
* These formats correspond to the similarly named MESA_FORMAT_*
@@ -1353,8 +1353,6 @@ struct __DRIdri2ExtensionRec {
* could be read after a flush."
*/
#define __DRI_IMAGE_USE_BACKBUFFER 0x0010
-/* Whether to expect explicit flushes for external consumers. */
-#define __DRI_IMAGE_USE_FLUSH_EXTERNAL 0x0020
#define __DRI_IMAGE_TRANSFER_READ 0x1
@@ -1755,53 +1753,6 @@ struct __DRIimageExtensionRec {
int renderbuffer,
void *loaderPrivate,
unsigned *error);
-
- /**
- * Flush the image for external consumers. This is called when
- * the current context is the producer.
- *
- * \since 18
- */
- void (*imageFlushExternal)(__DRIcontext *context, __DRIimage *image,
- unsigned flags);
-
- /**
- * This call indicates that the image has been modified outside of
- * the current context. This is called when the current context is
- * the consumer of the image.
- *
- * \since 18
- */
- void (*imageInvalidateExternal)(__DRIcontext *context, __DRIimage *image,
- unsigned flags);
-
- /**
- * Same as createImageFromName, but also specifies use.
- *
- * \since 18
- */
- __DRIimage *(*createImageFromName2)(__DRIscreen *screen,
- int width, int height, int format,
- int name, int pitch, unsigned use,
- void *loaderPrivate);
-
- /**
- * Same as createImageFromDmaBufs, but also specifies modifier and use.
- * Set modifier to DRM_FORMAT_MOD_INVALID if not using it.
- *
- * \since 18
- */
- __DRIimage *(*createImageFromDmaBufs3)(__DRIscreen *screen,
- int width, int height, int fourcc,
- uint64_t modifier, unsigned use,
- int *fds, int num_fds,
- int *strides, int *offsets,
- enum __DRIYUVColorSpace color_space,
- enum __DRISampleRange sample_range,
- enum __DRIChromaSiting horiz_siting,
- enum __DRIChromaSiting vert_siting,
- unsigned *error,
- void *loaderPrivate);
};