mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-01-01 20:30:12 +01:00
dri: delete INVALIDATE extension
this shouldn't be needed anymore since it doesn't do anything Reviewed-by: Adam Jackson <ajax@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33774>
This commit is contained in:
parent
6ab4a0b5c9
commit
0e87acb2f3
16 changed files with 2 additions and 60 deletions
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue