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

egl/gbm: remove DRI_KOPPER remnants

Browse source 
kopper struct member is still useful as a check, so replace it accordingly

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30472>
This commit is contained in:
Mike Blumenkrantz 2024-07-26 11:18:02 -04:00 • committed by Marge Bot
parent 5f8dec8f7c
commit 789df29fc3
5 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -625,7 +625,6 @@ static const struct dri_extension_match optional_core_extensions[] = {
{__DRI2_BLOB, 1, offsetof(struct dri2_egl_display, blob), true},
{__DRI_MUTABLE_RENDER_BUFFER_DRIVER, 1,
offsetof(struct dri2_egl_display, mutable_render_buffer), true},
{__DRI_KOPPER, 1, offsetof(struct dri2_egl_display, kopper), true},
};
const __DRIextension **
@ -659,6 +658,7 @@ dri2_load_driver_common(_EGLDisplay *disp,
return EGL_FALSE;
}
dri2_dpy->driver_extensions = extensions;
dri2_dpy->kopper = disp->Options.Zink && !debug_get_bool_option("LIBGL_KOPPER_DISABLE", false);
return EGL_TRUE;
}

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

@ -245,7 +245,6 @@ struct dri2_egl_display {
const __DRIimageDriverExtension *image_driver;
const __DRIdri2Extension *dri2;
const __DRIswrastExtension *swrast;
const __DRIkopperExtension *kopper;
const __DRI2flushExtension *flush;
const __DRI2flushControlExtension *flush_control;
const __DRItexBufferExtension *tex_buffer;
@ -271,6 +270,7 @@ struct dri2_egl_display {
bool own_device;
bool invalidate_available;
bool kopper;
int min_swap_interval;
int max_swap_interval;
int default_swap_interval;

1
src/egl/drivers/dri2/platform_drm.c
View file

@ -647,7 +647,6 @@ dri2_initialize_drm(_EGLDisplay *disp)
dri2_dpy->dri_screen_render_gpu = dri2_dpy->gbm_dri->screen;
dri2_dpy->image_driver = dri2_dpy->gbm_dri->image_driver;
dri2_dpy->swrast = dri2_dpy->gbm_dri->swrast;
dri2_dpy->kopper = dri2_dpy->gbm_dri->kopper;
dri2_dpy->driver_configs = dri2_dpy->gbm_dri->driver_configs;
dri2_dpy->gbm_dri->validate_image = dri2_validate_egl_image;

1
src/gbm/backends/dri/gbm_dri.c
View file

@ -242,7 +242,6 @@ static struct dri_extension_match gbm_dri_device_extensions[] = {
static struct dri_extension_match gbm_swrast_device_extensions[] = {
{ __DRI_SWRAST, 5, offsetof(struct gbm_dri_device, swrast), false },
{ __DRI_KOPPER, 1, offsetof(struct gbm_dri_device, kopper), true },
};
const __DRIextension **

1
src/gbm/backends/dri/gbm_driint.h
View file

@ -59,7 +59,6 @@ struct gbm_dri_device {
const __DRIimageExtension *image;
const __DRIimageDriverExtension *image_driver;
const __DRIswrastExtension *swrast;
const __DRIkopperExtension *kopper;
const __DRI2flushExtension *flush;
const __DRIconfig **driver_configs;