diff options
author | Kristian Høgsberg <[email protected]> | 2012-10-10 22:10:42 -0400 |
---|---|---|
committer | Kristian Høgsberg <[email protected]> | 2012-10-17 16:32:13 -0400 |
commit | 0229e3ae41be109ac423b2eb2ddf79e24b799d60 (patch) | |
tree | 5423c0a5e6a5a4c7559b03de3a84d230e6008451 /src/egl/drivers/dri2/egl_dri2.h | |
parent | be4c0a243e3314b8d8d24107494e2537a6d198ad (diff) |
egl/wayland: Update to Wayland 0.99 API
The 0.99.0 Wayland release changes the event API to provide a thread-safe
mechanism for receiving events specific to a subsystem (such as EGL) and
we need to use it in the EGL platform.
The Wayland protocol now also requires a commit request to make changes
take effect, issue that from eglSwapBuffers.
Diffstat (limited to 'src/egl/drivers/dri2/egl_dri2.h')
-rw-r--r-- | src/egl/drivers/dri2/egl_dri2.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index 85c0745a354..be359d36fa7 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -126,8 +126,10 @@ struct dri2_egl_display #ifdef HAVE_WAYLAND_PLATFORM struct wl_display *wl_dpy; + struct wl_registry *wl_registry; struct wl_drm *wl_server_drm; struct wl_drm *wl_drm; + struct wl_event_queue *wl_queue; int authenticated; int formats; #endif @@ -178,7 +180,7 @@ struct dri2_egl_surface __DRIbuffer *dri_buffers[__DRI_BUFFER_COUNT]; __DRIbuffer *third_buffer; __DRIbuffer *pending_buffer; - EGLBoolean block_swap_buffers; + struct wl_callback *frame_callback; int format; #endif |