summaryrefslogtreecommitdiffstats
path: root/src/egl/drivers/dri2/egl_dri2.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/egl/drivers/dri2/egl_dri2.h')
-rw-r--r--src/egl/drivers/dri2/egl_dri2.h23
1 files changed, 12 insertions, 11 deletions
diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h
index eb8c06e08a0..84ea2a6027b 100644
--- a/src/egl/drivers/dri2/egl_dri2.h
+++ b/src/egl/drivers/dri2/egl_dri2.h
@@ -172,28 +172,29 @@ struct dri2_egl_surface
#ifdef HAVE_WAYLAND_PLATFORM
struct wl_egl_window *wl_win;
- struct wl_egl_pixmap *wl_pix;
- struct wl_buffer *wl_drm_buffer[WL_BUFFER_COUNT];
- int wl_buffer_lock[WL_BUFFER_COUNT];
int dx;
int dy;
- __DRIbuffer *dri_buffers[__DRI_BUFFER_COUNT];
- __DRIbuffer *third_buffer;
- __DRIbuffer *pending_buffer;
struct wl_callback *frame_callback;
int format;
#endif
#ifdef HAVE_DRM_PLATFORM
struct gbm_dri_surface *gbm_surf;
+#endif
+
+#if defined(HAVE_WAYLAND_PLATFORM) || defined(HAVE_DRM_PLATFORM)
+ __DRIbuffer *dri_buffers[__DRI_BUFFER_COUNT];
struct {
+#ifdef HAVE_WAYLAND_PLATFORM
+ struct wl_buffer *wl_buffer;
+ __DRIbuffer *dri_buffer;
+#endif
+#ifdef HAVE_DRM_PLATFORM
struct gbm_bo *bo;
- int locked;
- int age;
- } color_buffers[3], *back, *current;
-#ifndef HAVE_WAYLAND_PLATFORM
- __DRIbuffer *dri_buffers[__DRI_BUFFER_COUNT];
#endif
+ int locked;
+ int age;
+ } color_buffers[3], *back, *current;
#endif
#ifdef HAVE_ANDROID_PLATFORM