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

egl/x11: Stop mixing kopper and swrast extensions

Browse source 
Neither has any dependence on the other.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36014>
This commit is contained in:
Faith Ekstrand 2025-07-04 15:23:06 -04:00 • committed by Marge Bot
parent f0c28e0250
commit 6366a8992f
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -154,6 +154,16 @@ dri2_get_pbuffer_drawable_info(struct dri_drawable *draw, int *x, int *y, int *w
*h = dri2_surf->base.Height;
}
static void
dri2_kopper_get_pbuffer_drawable_info(struct dri_drawable *draw,
int *w, int *h, void *loaderPrivate)
{
struct dri2_egl_surface *dri2_surf = loaderPrivate;
*w = dri2_surf->base.Width;
*h = dri2_surf->base.Height;
}
static int
dri2_get_bytes_per_pixel(struct dri2_egl_surface *dri2_surf)
{
@ -245,6 +255,7 @@ const __DRIswrastLoaderExtension swrast_pbuffer_loader_extension = {
const __DRIkopperLoaderExtension kopper_pbuffer_loader_extension = {
.base = {__DRI_KOPPER_LOADER, 1},
.GetDrawableInfo = dri2_kopper_get_pbuffer_drawable_info,
.SetSurfaceCreateInfo = NULL,
};

5
src/egl/drivers/dri2/platform_x11.c
View file

@ -1073,23 +1073,20 @@ static const __DRIkopperLoaderExtension kopper_loader_extension = {
};
static const __DRIextension *kopper_loader_extensions[] = {
&swrast_loader_extension.base,
&image_lookup_extension.base,
&kopper_loader_extension.base,
&image_lookup_extension.base,
NULL,
};
static const __DRIextension *swrast_loader_extensions[] = {
&swrast_loader_extension.base,
&image_lookup_extension.base,
&kopper_loader_extension.base,
NULL,
};
static const __DRIextension *swrast_loader_shm_extensions[] = {
&swrast_loader_shm_extension.base,
&image_lookup_extension.base,
&kopper_loader_extension.base,
NULL,
};