[Mesa-dev] [PATCH] egl: restrict swap_available dri2_egl_display field to X11

Frank Binns frank.binns at imgtec.com
Mon Jun 20 08:00:37 UTC 2016


This field is only ever set and read by the X11 platform.

Signed-off-by: Frank Binns <frank.binns at imgtec.com>
---
 src/egl/drivers/dri2/egl_dri2.h         | 2 +-
 src/egl/drivers/dri2/platform_wayland.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h
index 29820cc..317de06 100644
--- a/src/egl/drivers/dri2/egl_dri2.h
+++ b/src/egl/drivers/dri2/egl_dri2.h
@@ -178,7 +178,6 @@ struct dri2_egl_display
    int                       fd;
 
    int                       own_device;
-   int                       swap_available;
    int                       invalidate_available;
    int                       min_swap_interval;
    int                       max_swap_interval;
@@ -198,6 +197,7 @@ struct dri2_egl_display
 #ifdef HAVE_X11_PLATFORM
    xcb_connection_t         *conn;
    int                      screen;
+   int                      swap_available;
 #ifdef HAVE_DRI3
    struct loader_dri3_extensions loader_dri3_ext;
 #endif
diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
index ff0d5c8..e714e44 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -1155,8 +1155,6 @@ dri2_initialize_wayland_drm(_EGLDriver *drv, _EGLDisplay *disp)
    } else
       dri2_dpy->extensions[3] = NULL;
 
-   dri2_dpy->swap_available = EGL_TRUE;
-
    if (!dri2_create_screen(disp))
       goto cleanup_driver;
 
-- 
2.7.4



More information about the mesa-dev mailing list