diff options
| author | Jason Ekstrand <[email protected]> | 2015-06-23 18:05:25 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-06-23 18:05:25 -0700 |
| commit | a62edcce4eb4c800d972817a20ee874bf2a2c3ef (patch) | |
| tree | 46083a8762d45a6c595c7aaee2bb1cd0fc36eb62 /src/egl/drivers/dri2/egl_dri2.h | |
| parent | 9b9f973ca6d3cc1ec5be27857def00a83c032464 (diff) | |
| parent | 6844d6b7f8398a25eff511541b187afeb1199ce0 (diff) | |
Merge remote-tracking branch 'mesa-public/master' into vulkan
Diffstat (limited to 'src/egl/drivers/dri2/egl_dri2.h')
| -rw-r--r-- | src/egl/drivers/dri2/egl_dri2.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index 371fb4aee4a..9985c49f984 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -196,10 +196,13 @@ struct dri2_egl_display struct wl_registry *wl_registry; struct wl_drm *wl_server_drm; struct wl_drm *wl_drm; + struct wl_shm *wl_shm; struct wl_event_queue *wl_queue; int authenticated; int formats; uint32_t capabilities; + int is_render_node; + int is_different_gpu; #endif }; @@ -253,6 +256,11 @@ struct dri2_egl_surface #ifdef HAVE_WAYLAND_PLATFORM struct wl_buffer *wl_buffer; __DRIimage *dri_image; + /* for is_different_gpu case. NULL else */ + __DRIimage *linear_copy; + /* for swrast */ + void *data; + int data_size; #endif #ifdef HAVE_DRM_PLATFORM struct gbm_bo *bo; @@ -343,6 +351,9 @@ dri2_initialize_wayland(_EGLDriver *drv, _EGLDisplay *disp); EGLBoolean dri2_initialize_android(_EGLDriver *drv, _EGLDisplay *disp); +EGLBoolean +dri2_initialize_surfaceless(_EGLDriver *drv, _EGLDisplay *disp); + void dri2_flush_drawable_for_swapbuffers(_EGLDisplay *disp, _EGLSurface *draw); |