From: Emil Velikov <emil.veli...@collabora.com>
Similar to the dri2 one - the extension stored in struct
dri2_egl_display is unused.
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
---
src/egl/drivers/dri2/platform_wayland.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/egl/drivers/dri2/platform_wayland.c
b/src/egl/drivers/dri2/platform_wayland.c
index c791f25..0447255 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -1789,6 +1789,15 @@ static struct dri2_egl_display_vtbl
dri2_wl_swrast_display_vtbl = {
.get_dri_drawable = dri2_surface_get_dri_drawable,
};
+static const __DRIswrastLoaderExtension swrast_loader_extension = {
+ .base = { __DRI_SWRAST_LOADER, 2 },
+
+ .getDrawableInfo = dri2_wl_swrast_get_drawable_info,
+ .putImage = dri2_wl_swrast_put_image,
+ .getImage = dri2_wl_swrast_get_image,
+ .putImage2 = dri2_wl_swrast_put_image2,
+};
+
static EGLBoolean
dri2_initialize_wayland_swrast(_EGLDriver *drv, _EGLDisplay *disp)
{
@@ -1839,14 +1848,7 @@ dri2_initialize_wayland_swrast(_EGLDriver *drv,
_EGLDisplay *disp)
if (!dri2_load_driver_swrast(disp))
goto cleanup_shm;
- dri2_dpy->swrast_loader_extension.base.name = __DRI_SWRAST_LOADER;
- dri2_dpy->swrast_loader_extension.base.version = 2;
- dri2_dpy->swrast_loader_extension.getDrawableInfo =
dri2_wl_swrast_get_drawable_info;
- dri2_dpy->swrast_loader_extension.putImage = dri2_wl_swrast_put_image;
- dri2_dpy->swrast_loader_extension.getImage = dri2_wl_swrast_get_image;
- dri2_dpy->swrast_loader_extension.putImage2 = dri2_wl_swrast_put_image2;
-
- dri2_dpy->extensions[0] = &dri2_dpy->swrast_loader_extension.base;
+ dri2_dpy->extensions[0] = &swrast_loader_extension.base;
dri2_dpy->extensions[1] = NULL;
if (!dri2_create_screen(disp))
--
2.9.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
