fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 20:28:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

egl: delete DRI_CONFIG_OPTIONS remnants

Browse source 
also simplify driver opening a little

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30494>
This commit is contained in:
Mike Blumenkrantz 2024-07-30 09:11:25 -04:00 • committed by Marge Bot
parent 7ea0091a19
commit a940f17ee1
2 changed files with 4 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -585,26 +585,11 @@ const __DRIimageLookupExtension image_lookup_extension = {
.lookupEGLImageValidated = dri2_lookup_egl_image_validated,
};
static const struct dri_extension_match dri3_driver_extensions[] = {
{__DRI_CONFIG_OPTIONS, 2, offsetof(struct dri2_egl_display, configOptions),
true},
};
static const struct dri_extension_match dri2_driver_extensions[] = {
{__DRI_CONFIG_OPTIONS, 2, offsetof(struct dri2_egl_display, configOptions),
true},
};
static const struct dri_extension_match dri2_core_extensions[] = {
{__DRI2_FLUSH, 1, offsetof(struct dri2_egl_display, flush), false},
{__DRI_TEX_BUFFER, 2, offsetof(struct dri2_egl_display, tex_buffer), false},
};
static const struct dri_extension_match swrast_driver_extensions[] = {
{__DRI_CONFIG_OPTIONS, 2, offsetof(struct dri2_egl_display, configOptions),
true},
};
static const struct dri_extension_match swrast_core_extensions[] = {
{__DRI_TEX_BUFFER, 2, offsetof(struct dri2_egl_display, tex_buffer), false},
};
@ -634,9 +619,7 @@ dri2_open_driver(_EGLDisplay *disp)
}
static EGLBoolean
dri2_load_driver_common(_EGLDisplay *disp,
const struct dri_extension_match *driver_extensions,
int num_matches)
dri2_load_driver_common(_EGLDisplay *disp)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
const __DRIextension **extensions;
@ -648,10 +631,6 @@ dri2_load_driver_common(_EGLDisplay *disp,
return EGL_FALSE;
}
if (!loader_bind_extensions(dri2_dpy, driver_extensions, num_matches,
extensions)) {
return EGL_FALSE;
}
dri2_dpy->driver_extensions = extensions;
dri2_dpy->kopper = disp->Options.Zink && !debug_get_bool_option("LIBGL_KOPPER_DISABLE", false);
dri2_dpy->swrast = (disp->Options.ForceSoftware && !dri2_dpy->kopper) ||
@ -663,22 +642,19 @@ dri2_load_driver_common(_EGLDisplay *disp,
EGLBoolean
dri2_load_driver(_EGLDisplay *disp)
{
return dri2_load_driver_common(disp, dri2_driver_extensions,
ARRAY_SIZE(dri2_driver_extensions));
return dri2_load_driver_common(disp);
}
EGLBoolean
dri2_load_driver_dri3(_EGLDisplay *disp)
{
return dri2_load_driver_common(disp, dri3_driver_extensions,
ARRAY_SIZE(dri3_driver_extensions));
return dri2_load_driver_common(disp);
}
EGLBoolean
dri2_load_driver_swrast(_EGLDisplay *disp)
{
return dri2_load_driver_common(disp, swrast_driver_extensions,
ARRAY_SIZE(swrast_driver_extensions));
return dri2_load_driver_common(disp);
}
static const char *

1
src/egl/drivers/dri2/egl_dri2.h
View file

@ -250,7 +250,6 @@ struct dri2_egl_display {
const __DRI2bufferDamageExtension *buffer_damage;
const __DRI2blobExtension *blob;
const __DRI2interopExtension *interop;
const __DRIconfigOptionsExtension *configOptions;
const __DRImutableRenderBufferDriverExtension *mutable_render_buffer;
/* fd of the GPU used for rendering. */
int fd_render_gpu;