projects / packages / Mesa.git / blame
| Commit | Line | Data |
|---|---|---|
| 4469c4e7 AF |
1 | From c5279d643b528690243803c923fd3ff74b1b9dd5 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net> | |
| 3 | Date: Wed, 7 Aug 2013 11:19:59 -0700 | |
| 4 | Subject: [PATCH 4/4] gallium-egl: Commit the rest of the | |
| 5 | native_wayland_drm_bufmgr_helper v2 patch | |
| 6 | MIME-Version: 1.0 | |
| 7 | Content-Type: text/plain; charset=UTF-8 | |
| 8 | Content-Transfer-Encoding: 8bit | |
| 9 | ||
| 10 | I missed Anders v2 on the list which fixed non-wayland compilation: | |
| 11 | ||
| 12 | http://lists.freedesktop.org/archives/mesa-dev/2013-July/042062.html | |
| 13 | ||
| 14 | Signed-off-by: Kristian Høgsberg <krh@bitplanet.net> | |
| 15 | --- | |
| 16 | src/gallium/state_trackers/egl/drm/native_drm.c | 2 ++ | |
| 17 | src/gallium/state_trackers/egl/drm/native_drm.h | 4 ---- | |
| 18 | src/gallium/state_trackers/egl/x11/native_dri2.c | 5 ++--- | |
| 19 | 3 files changed, 4 insertions(+), 7 deletions(-) | |
| 20 | ||
| 21 | diff --git a/src/gallium/state_trackers/egl/drm/native_drm.c b/src/gallium/state_trackers/egl/drm/native_drm.c | |
| 22 | index 88ac490..c82bbe4 100644 | |
| 23 | --- a/src/gallium/state_trackers/egl/drm/native_drm.c | |
| 24 | +++ b/src/gallium/state_trackers/egl/drm/native_drm.c | |
| 25 | @@ -132,7 +132,9 @@ drm_display_destroy(struct native_display *ndpy) | |
| 26 | ||
| 27 | FREE(drmdpy->device_name); | |
| 28 | ||
| 29 | +#ifdef HAVE_WAYLAND_BACKEND | |
| 30 | wayland_drm_bufmgr_destroy(ndpy->wayland_bufmgr); | |
| 31 | +#endif | |
| 32 | ||
| 33 | if (drmdpy->own_gbm) { | |
| 34 | gbm_device_destroy(&drmdpy->gbmdrm->base.base); | |
| 35 | diff --git a/src/gallium/state_trackers/egl/drm/native_drm.h b/src/gallium/state_trackers/egl/drm/native_drm.h | |
| 36 | index 2c015b2..6a1cd5d 100644 | |
| 37 | --- a/src/gallium/state_trackers/egl/drm/native_drm.h | |
| 38 | +++ b/src/gallium/state_trackers/egl/drm/native_drm.h | |
| 39 | @@ -67,10 +67,6 @@ struct drm_display { | |
| 40 | struct drm_surface **shown_surfaces; | |
| 41 | /* save the original settings of the CRTCs */ | |
| 42 | struct drm_crtc *saved_crtcs; | |
| 43 | - | |
| 44 | -#ifdef HAVE_WAYLAND_BACKEND | |
| 45 | - struct wl_drm *wl_server_drm; /* for EGL_WL_bind_wayland_display */ | |
| 46 | -#endif | |
| 47 | }; | |
| 48 | ||
| 49 | struct drm_config { | |
| 50 | diff --git a/src/gallium/state_trackers/egl/x11/native_dri2.c b/src/gallium/state_trackers/egl/x11/native_dri2.c | |
| 51 | index 3d08863..3aa7c17 100644 | |
| 52 | --- a/src/gallium/state_trackers/egl/x11/native_dri2.c | |
| 53 | +++ b/src/gallium/state_trackers/egl/x11/native_dri2.c | |
| 54 | @@ -60,9 +60,6 @@ struct dri2_display { | |
| 55 | int num_configs; | |
| 56 | ||
| 57 | struct util_hash_table *surfaces; | |
| 58 | -#ifdef HAVE_WAYLAND_BACKEND | |
| 59 | - struct wl_drm *wl_server_drm; /* for EGL_WL_bind_wayland_display */ | |
| 60 | -#endif | |
| 61 | }; | |
| 62 | ||
| 63 | struct dri2_surface { | |
| 64 | @@ -757,7 +754,9 @@ dri2_display_destroy(struct native_display *ndpy) | |
| 65 | if (dri2dpy->surfaces) | |
| 66 | util_hash_table_destroy(dri2dpy->surfaces); | |
| 67 | ||
| 68 | +#ifdef HAVE_WAYLAND_BACKEND | |
| 69 | wayland_drm_bufmgr_destroy(ndpy->wayland_bufmgr); | |
| 70 | +#endif | |
| 71 | ||
| 72 | if (dri2dpy->xscr) | |
| 73 | x11_screen_destroy(dri2dpy->xscr); | |
| 74 | -- | |
| 75 | 1.8.4 | |
| 76 |