From f0c28e02504b2fcd102a73b6ef12424b984f2b95 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Tue, 8 Jul 2025 17:23:45 -0400 Subject: [PATCH] egl: Add a shared kopper_pbuffer_loader_extension Reviewed-by: Adam Jackson Reviewed-By: Mike Blumenkrantz Part-of: --- src/egl/drivers/dri2/egl_dri2.c | 5 +++++ src/egl/drivers/dri2/egl_dri2.h | 1 + src/egl/drivers/dri2/platform_device.c | 10 ++-------- src/egl/drivers/dri2/platform_surfaceless.c | 10 ++-------- 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index da39ce2ef0f..60681bdea0a 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -243,6 +243,11 @@ const __DRIswrastLoaderExtension swrast_pbuffer_loader_extension = { .getImage = dri2_get_image, }; +const __DRIkopperLoaderExtension kopper_pbuffer_loader_extension = { + .base = {__DRI_KOPPER_LOADER, 1}, + .SetSurfaceCreateInfo = NULL, +}; + static const EGLint dri2_to_egl_attribute_map[__DRI_ATTRIB_MAX] = { [__DRI_ATTRIB_BUFFER_SIZE] = EGL_BUFFER_SIZE, [__DRI_ATTRIB_LEVEL] = EGL_LEVEL, diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index 1682a9c6eb5..8524726c1ab 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -439,6 +439,7 @@ dri2_egl_error_unlock(struct dri2_egl_display *dri2_dpy, EGLint err, extern const __DRIimageLookupExtension image_lookup_extension; extern const __DRIbackgroundCallableExtension background_callable_extension; extern const __DRIswrastLoaderExtension swrast_pbuffer_loader_extension; +extern const __DRIkopperLoaderExtension kopper_pbuffer_loader_extension; void dri2_detect_swrast(_EGLDisplay *disp); diff --git a/src/egl/drivers/dri2/platform_device.c b/src/egl/drivers/dri2/platform_device.c index bcd5b69aff3..142e3caf234 100644 --- a/src/egl/drivers/dri2/platform_device.c +++ b/src/egl/drivers/dri2/platform_device.c @@ -202,23 +202,17 @@ static const __DRIimageLoaderExtension image_loader_extension = { .getCapability = device_get_capability, }; -static const __DRIkopperLoaderExtension kopper_loader_extension = { - .base = {__DRI_KOPPER_LOADER, 1}, - - .SetSurfaceCreateInfo = NULL, -}; - static const __DRIextension *image_loader_extensions[] = { &image_loader_extension.base, &image_lookup_extension.base, - &kopper_loader_extension.base, + &kopper_pbuffer_loader_extension.base, NULL, }; static const __DRIextension *swrast_loader_extensions[] = { &swrast_pbuffer_loader_extension.base, &image_lookup_extension.base, - &kopper_loader_extension.base, + &kopper_pbuffer_loader_extension.base, NULL, }; diff --git a/src/egl/drivers/dri2/platform_surfaceless.c b/src/egl/drivers/dri2/platform_surfaceless.c index e60a0731cbf..b90e8672e8f 100644 --- a/src/egl/drivers/dri2/platform_surfaceless.c +++ b/src/egl/drivers/dri2/platform_surfaceless.c @@ -199,12 +199,6 @@ surfaceless_get_capability(void *loaderPrivate, enum dri_loader_cap cap) } } -static const __DRIkopperLoaderExtension kopper_loader_extension = { - .base = {__DRI_KOPPER_LOADER, 1}, - - .SetSurfaceCreateInfo = NULL, -}; - static const __DRIimageLoaderExtension image_loader_extension = { .base = {__DRI_IMAGE_LOADER, 2}, .getBuffers = surfaceless_image_get_buffers, @@ -215,13 +209,13 @@ static const __DRIimageLoaderExtension image_loader_extension = { static const __DRIextension *image_loader_extensions[] = { &image_loader_extension.base, &image_lookup_extension.base, &background_callable_extension.base, - &kopper_loader_extension.base, NULL, + &kopper_pbuffer_loader_extension.base, NULL, }; static const __DRIextension *swrast_loader_extensions[] = { &swrast_pbuffer_loader_extension.base, &image_loader_extension.base, &image_lookup_extension.base, - &kopper_loader_extension.base, NULL, + &kopper_pbuffer_loader_extension.base, NULL, }; static bool