summaryrefslogtreecommitdiffstats
path: root/src/egl/drivers
diff options
context:
space:
mode:
authorEmil Velikov <emil.velikov@collabora.com>2016-08-16 18:39:14 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2016-10-14 12:42:00 +0100
commit2dbe14af1ea6b9d7af13a3067f52f844c658d412 (patch)
tree9dadda4fb10da15e492920ca7a3f51b312470196 /src/egl/drivers
parent3963a5fc941b00ea8c6491599d4db6bc82c2d647 (diff)
downloadexternal_mesa3d-2dbe14af1ea6b9d7af13a3067f52f844c658d412.zip
external_mesa3d-2dbe14af1ea6b9d7af13a3067f52f844c658d412.tar.gz
external_mesa3d-2dbe14af1ea6b9d7af13a3067f52f844c658d412.tar.bz2
egl/wayland: don't populate dri2_dpy->swrast_loader_extension
Similar to the dri2 one - the extension stored in struct dri2_egl_display is unused. Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Diffstat (limited to 'src/egl/drivers')
-rw-r--r--src/egl/drivers/dri2/platform_wayland.c18
1 files 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))