diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 9df1ecff7b0..7c76515dd31 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -157,10 +157,6 @@ const __DRIbackgroundCallableExtension background_callable_extension = { .isThreadSafe = dri_is_thread_safe, }; -const __DRIuseInvalidateExtension use_invalidate = { - .base = {__DRI_USE_INVALIDATE, 1}, -}; - static void dri2_get_pbuffer_drawable_info(struct dri_drawable *draw, int *x, int *y, int *w, int *h, void *loaderPrivate) diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index df583b2823f..5cafe8b56ff 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -442,7 +442,6 @@ dri2_egl_error_unlock(struct dri2_egl_display *dri2_dpy, EGLint err, } extern const __DRIimageLookupExtension image_lookup_extension; -extern const __DRIuseInvalidateExtension use_invalidate; extern const __DRIbackgroundCallableExtension background_callable_extension; extern const __DRIswrastLoaderExtension swrast_pbuffer_loader_extension; diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index ea04a86545b..bbb414957c3 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -1006,7 +1006,6 @@ static const __DRImutableRenderBufferLoaderExtension static const __DRIextension *droid_image_loader_extensions[] = { &droid_image_loader_extension.base, &image_lookup_extension.base, - &use_invalidate.base, &droid_mutable_render_buffer_extension.base, NULL, }; @@ -1014,7 +1013,6 @@ static const __DRIextension *droid_image_loader_extensions[] = { static const __DRIextension *droid_swrast_image_loader_extensions[] = { &droid_image_loader_extension.base, &image_lookup_extension.base, - &use_invalidate.base, &droid_mutable_render_buffer_extension.base, &swrast_loader_extension.base, NULL, diff --git a/src/egl/drivers/dri2/platform_device.c b/src/egl/drivers/dri2/platform_device.c index 41ab931e3d7..f3224cfe968 100644 --- a/src/egl/drivers/dri2/platform_device.c +++ b/src/egl/drivers/dri2/platform_device.c @@ -211,7 +211,6 @@ static const __DRIkopperLoaderExtension kopper_loader_extension = { static const __DRIextension *image_loader_extensions[] = { &image_loader_extension.base, &image_lookup_extension.base, - &use_invalidate.base, &kopper_loader_extension.base, NULL, }; @@ -219,7 +218,6 @@ static const __DRIextension *image_loader_extensions[] = { static const __DRIextension *swrast_loader_extensions[] = { &swrast_pbuffer_loader_extension.base, &image_lookup_extension.base, - &use_invalidate.base, &kopper_loader_extension.base, NULL, }; diff --git a/src/egl/drivers/dri2/platform_surfaceless.c b/src/egl/drivers/dri2/platform_surfaceless.c index 87d06c50656..467f994cc42 100644 --- a/src/egl/drivers/dri2/platform_surfaceless.c +++ b/src/egl/drivers/dri2/platform_surfaceless.c @@ -212,13 +212,13 @@ static const __DRIimageLoaderExtension image_loader_extension = { static const __DRIextension *image_loader_extensions[] = { &image_loader_extension.base, &image_lookup_extension.base, - &use_invalidate.base, &background_callable_extension.base, + &background_callable_extension.base, &kopper_loader_extension.base, NULL, }; static const __DRIextension *swrast_loader_extensions[] = { &swrast_pbuffer_loader_extension.base, &image_loader_extension.base, - &image_lookup_extension.base, &use_invalidate.base, + &image_lookup_extension.base, &kopper_loader_extension.base, NULL, }; diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c index 1f66a92fd35..e0138719738 100644 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c @@ -2138,7 +2138,6 @@ static const struct dri2_egl_display_vtbl dri2_wl_display_vtbl = { static const __DRIextension *dri2_loader_extensions[] = { &image_loader_extension.base, &image_lookup_extension.base, - &use_invalidate.base, NULL, }; @@ -2981,7 +2980,6 @@ static const __DRIextension *kopper_swrast_loader_extensions[] = { &kopper_swrast_loader_extension.base, &image_lookup_extension.base, &kopper_loader_extension.base, - &use_invalidate.base, NULL, }; diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c index c1cb2448cb3..fd669e1cc67 100644 --- a/src/egl/drivers/dri2/platform_x11.c +++ b/src/egl/drivers/dri2/platform_x11.c @@ -1595,7 +1595,6 @@ static const __DRIextension *kopper_loader_extensions[] = { &swrast_loader_extension.base, &image_lookup_extension.base, &kopper_loader_extension.base, - &use_invalidate.base, NULL, }; @@ -1836,7 +1835,6 @@ cleanup: static const __DRIextension *dri3_image_loader_extensions[] = { &dri3_image_loader_extension.base, &image_lookup_extension.base, - &use_invalidate.base, &background_callable_extension.base, NULL, }; @@ -1938,7 +1936,6 @@ static const __DRIextension *dri2_loader_extensions_old[] = { static const __DRIextension *dri2_loader_extensions[] = { &dri2_loader_extension.base, &image_lookup_extension.base, - &use_invalidate.base, &background_callable_extension.base, NULL, }; diff --git a/src/gallium/frontends/dri/dri_screen.h b/src/gallium/frontends/dri/dri_screen.h index b01fcb46f48..01656d7c1b8 100644 --- a/src/gallium/frontends/dri/dri_screen.h +++ b/src/gallium/frontends/dri/dri_screen.h @@ -73,7 +73,6 @@ struct dri_screen * fields will not be valid or initializaed in that case. */ const __DRIdri2LoaderExtension *loader; const __DRIimageLookupExtension *image; - const __DRIuseInvalidateExtension *useInvalidate; const __DRIbackgroundCallableExtension *backgroundCallable; } dri2; diff --git a/src/gallium/frontends/dri/dri_util.c b/src/gallium/frontends/dri/dri_util.c index 887589192ee..bca41efba16 100644 --- a/src/gallium/frontends/dri/dri_util.c +++ b/src/gallium/frontends/dri/dri_util.c @@ -81,7 +81,6 @@ setupLoaderExtensions(struct dri_screen *screen, static const struct dri_extension_match matches[] = { {__DRI_DRI2_LOADER, 1, offsetof(struct dri_screen, dri2.loader), true}, {__DRI_IMAGE_LOOKUP, 1, offsetof(struct dri_screen, dri2.image), true}, - {__DRI_USE_INVALIDATE, 1, offsetof(struct dri_screen, dri2.useInvalidate), true}, {__DRI_BACKGROUND_CALLABLE, 1, offsetof(struct dri_screen, dri2.backgroundCallable), true}, {__DRI_SWRAST_LOADER, 1, offsetof(struct dri_screen, swrast_loader), true}, {__DRI_IMAGE_LOADER, 1, offsetof(struct dri_screen, image.loader), true}, @@ -112,11 +111,6 @@ driCreateNewScreen3(int scrn, int fd, return NULL; setupLoaderExtensions(screen, loader_extensions); - // dri2 drivers require working invalidate - if (fd != -1 && !screen->dri2.useInvalidate) { - free(screen); - return NULL; - } screen->loaderPrivate = data; diff --git a/src/gallium/include/mesa_interface.h b/src/gallium/include/mesa_interface.h index 7e7432d1edf..36317511b2f 100644 --- a/src/gallium/include/mesa_interface.h +++ b/src/gallium/include/mesa_interface.h @@ -370,26 +370,6 @@ typedef struct { int shmid, void *loaderPrivate); } __DRIswrastLoaderExtension; -/** - * Invalidate loader extension. The presence of this extension - * indicates to the DRI driver that the loader will call invalidate in - * the __DRI2_FLUSH extension, whenever the needs to query for new - * buffers. This means that the DRI driver can drop the polling in - * glViewport(). - * - * The extension doesn't provide any functionality, it's only use to - * indicate to the driver that it can use the new semantics. A DRI - * driver can use this to switch between the different semantics or - * just refuse to initialize if this extension isn't present. - * - * Advertised by the X server. - */ -#define __DRI_USE_INVALIDATE "DRI_UseInvalidate" - -typedef struct { - __DRIextension base; -} __DRIuseInvalidateExtension; - /** * Tokens for struct dri_config attribs. A number of attributes defined by * GLX or EGL standards are not in the table, as they must be provided diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c index 316b251dd74..a51e3cb3b8d 100644 --- a/src/gbm/backends/dri/gbm_dri.c +++ b/src/gbm/backends/dri/gbm_dri.c @@ -194,10 +194,6 @@ swrast_get_image(struct dri_drawable *driDrawable, data, surf->dri_private); } -static const __DRIuseInvalidateExtension use_invalidate = { - .base = { __DRI_USE_INVALIDATE, 1 } -}; - static const __DRIimageLookupExtension image_lookup_extension = { .base = { __DRI_IMAGE_LOOKUP, 2 }, @@ -230,7 +226,6 @@ static const __DRIkopperLoaderExtension kopper_loader_extension = { static const __DRIextension *gbm_dri_screen_extensions[] = { &image_lookup_extension.base, - &use_invalidate.base, &image_loader_extension.base, &swrast_loader_extension.base, &kopper_loader_extension.base, diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c index 362ebc34a1b..04b58df64ab 100644 --- a/src/glx/dri2_glx.c +++ b/src/glx/dri2_glx.c @@ -641,7 +641,6 @@ static const struct glx_context_vtable dri2_context_vtable = { static const __DRIextension *loader_extensions[] = { &dri2LoaderExtension.base, - &dri2UseInvalidate.base, &driBackgroundCallable.base, NULL }; diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c index e3ad92bc450..8f7783fc41f 100644 --- a/src/glx/dri3_glx.c +++ b/src/glx/dri3_glx.c @@ -366,10 +366,6 @@ static const __DRIimageLoaderExtension imageLoaderExtension = { .flushSwapBuffers = dri3_flush_swap_buffers, }; -const __DRIuseInvalidateExtension dri3UseInvalidate = { - .base = { __DRI_USE_INVALIDATE, 1 } -}; - static const __DRIbackgroundCallableExtension dri3BackgroundCallable = { .base = { __DRI_BACKGROUND_CALLABLE, 2 }, @@ -379,7 +375,6 @@ static const __DRIbackgroundCallableExtension dri3BackgroundCallable = { static const __DRIextension *loader_extensions[] = { &imageLoaderExtension.base, - &dri3UseInvalidate.base, &dri3BackgroundCallable.base, NULL }; diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c index 2c6b07ee0b2..67ab361c952 100644 --- a/src/glx/dri_common.c +++ b/src/glx/dri_common.c @@ -762,10 +762,6 @@ const __DRIbackgroundCallableExtension driBackgroundCallable = { .isThreadSafe = driIsThreadSafe, }; -const __DRIuseInvalidateExtension dri2UseInvalidate = { - .base = { __DRI_USE_INVALIDATE, 1 } -}; - Bool dri_bind_context(struct glx_context *context, GLXDrawable draw, GLXDrawable read) { diff --git a/src/glx/dri_common.h b/src/glx/dri_common.h index 8f40006f55a..ef001be0de6 100644 --- a/src/glx/dri_common.h +++ b/src/glx/dri_common.h @@ -89,7 +89,6 @@ dri_common_create_context(struct glx_screen *base, int renderType); extern const __DRIbackgroundCallableExtension driBackgroundCallable; -extern const __DRIuseInvalidateExtension dri2UseInvalidate; Bool dri_bind_context(struct glx_context *context, GLXDrawable draw, GLXDrawable read); diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c index c567cd6bc19..45837a81f37 100644 --- a/src/glx/drisw_glx.c +++ b/src/glx/drisw_glx.c @@ -410,7 +410,6 @@ static const __DRIextension *loader_extensions_noshm[] = { static const __DRIextension *kopper_extensions_noshm[] = { &swrastLoaderExtension.base, &kopperLoaderExtension.base, - &dri2UseInvalidate.base, &driBackgroundCallable.base, NULL };