fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 09:00:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

egl: Bump minimum version of __DRI_IMAGE to 6 and drop version checks.

Browse source 
All __DRI_IMAGEs in tree are v6+ (lowest being drisw) and implement
createImageFromTexture.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20044>
This commit is contained in:
Emma Anholt 2022-11-28 11:12:44 -08:00 • committed by Marge Bot
parent 12d67aabed
commit d92dd4fb2f
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/egl/drivers/dri2/egl_dri2.c
View file

@ -722,7 +722,7 @@ static const struct dri2_extension_match dri2_driver_extensions[] = {
static const struct dri2_extension_match dri2_core_extensions[] = { static const struct dri2_extension_match dri2_core_extensions[] = {
{ __DRI2_FLUSH, 1, offsetof(struct dri2_egl_display, flush) }, { __DRI2_FLUSH, 1, offsetof(struct dri2_egl_display, flush) },
{ __DRI_TEX_BUFFER, 2, offsetof(struct dri2_egl_display, tex_buffer) }, { __DRI_TEX_BUFFER, 2, offsetof(struct dri2_egl_display, tex_buffer) },
{ __DRI_IMAGE, 1, offsetof(struct dri2_egl_display, image) }, { __DRI_IMAGE, 6, offsetof(struct dri2_egl_display, image) },
{ NULL, 0, 0 } { NULL, 0, 0 }
}; };
@ -749,7 +749,7 @@ static const struct dri2_extension_match optional_core_extensions[] = {
{ __DRI2_BUFFER_DAMAGE, 1, offsetof(struct dri2_egl_display, buffer_damage) }, { __DRI2_BUFFER_DAMAGE, 1, offsetof(struct dri2_egl_display, buffer_damage) },
{ __DRI2_RENDERER_QUERY, 1, offsetof(struct dri2_egl_display, rendererQuery) }, { __DRI2_RENDERER_QUERY, 1, offsetof(struct dri2_egl_display, rendererQuery) },
{ __DRI2_INTEROP, 1, offsetof(struct dri2_egl_display, interop) }, { __DRI2_INTEROP, 1, offsetof(struct dri2_egl_display, interop) },
{ __DRI_IMAGE, 1, offsetof(struct dri2_egl_display, image) }, { __DRI_IMAGE, 6, offsetof(struct dri2_egl_display, image) },
{ __DRI2_FLUSH_CONTROL, 1, offsetof(struct dri2_egl_display, flush_control) }, { __DRI2_FLUSH_CONTROL, 1, offsetof(struct dri2_egl_display, flush_control) },
{ __DRI2_BLOB, 1, offsetof(struct dri2_egl_display, blob) }, { __DRI2_BLOB, 1, offsetof(struct dri2_egl_display, blob) },
{ __DRI_MUTABLE_RENDER_BUFFER_DRIVER, 1, offsetof(struct dri2_egl_display, mutable_render_buffer) }, { __DRI_MUTABLE_RENDER_BUFFER_DRIVER, 1, offsetof(struct dri2_egl_display, mutable_render_buffer) },
@ -997,15 +997,12 @@ dri2_setup_screen(_EGLDisplay *disp)
disp->Extensions.KHR_image_base = EGL_TRUE; disp->Extensions.KHR_image_base = EGL_TRUE;
disp->Extensions.KHR_gl_renderbuffer_image = EGL_TRUE; disp->Extensions.KHR_gl_renderbuffer_image = EGL_TRUE;
if (dri2_dpy->image->base.version >= 5 && disp->Extensions.KHR_gl_texture_2D_image = EGL_TRUE;
dri2_dpy->image->createImageFromTexture) { disp->Extensions.KHR_gl_texture_cubemap_image = EGL_TRUE;
disp->Extensions.KHR_gl_texture_2D_image = EGL_TRUE;
disp->Extensions.KHR_gl_texture_cubemap_image = EGL_TRUE;
if (dri2_renderer_query_integer(dri2_dpy, if (dri2_renderer_query_integer(dri2_dpy,
__DRI2_RENDERER_HAS_TEXTURE_3D)) __DRI2_RENDERER_HAS_TEXTURE_3D))
disp->Extensions.KHR_gl_texture_3D_image = EGL_TRUE; disp->Extensions.KHR_gl_texture_3D_image = EGL_TRUE;
}
#ifdef HAVE_LIBDRM #ifdef HAVE_LIBDRM
if (dri2_dpy->image->base.version >= 8 && if (dri2_dpy->image->base.version >= 8 &&
dri2_dpy->image->createImageFromDmaBufs) { dri2_dpy->image->createImageFromDmaBufs) {

2
src/gallium/frontends/dri/dri2.c
View file

@ -835,7 +835,7 @@ dri2_flush_swapbuffers(struct dri_context *ctx,
{ {
const __DRIimageLoaderExtension *image = drawable->screen->image.loader; const __DRIimageLoaderExtension *image = drawable->screen->image.loader;
if (image && image->base.version >= 3 && image->flushSwapBuffers) { if (image && image->flushSwapBuffers) {
image->flushSwapBuffers(opaque_dri_drawable(drawable), image->flushSwapBuffers(opaque_dri_drawable(drawable),
drawable->loaderPrivate); drawable->loaderPrivate);
} }