fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gallium-egl: Commit the rest of the native_wayland_drm_bufmgr_helper v2 patch

Browse source 
I missed Anders v2 on the list which fixed non-wayland compilation:

http://lists.freedesktop.org/archives/mesa-dev/2013-July/042062.html

Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
This commit is contained in:
Kristian Høgsberg 2013-08-07 11:19:59 -07:00
parent 8d29b5271a
commit 5575fdaccf
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/state_trackers/egl/drm/native_drm.c
View file

@ -132,7 +132,9 @@ drm_display_destroy(struct native_display *ndpy)
FREE(drmdpy->device_name);
#ifdef HAVE_WAYLAND_BACKEND
wayland_drm_bufmgr_destroy(ndpy->wayland_bufmgr);
#endif
if (drmdpy->own_gbm) {
gbm_device_destroy(&drmdpy->gbmdrm->base.base);

4
src/gallium/state_trackers/egl/drm/native_drm.h
View file

@ -67,10 +67,6 @@ struct drm_display {
struct drm_surface **shown_surfaces;
/* save the original settings of the CRTCs */
struct drm_crtc *saved_crtcs;
#ifdef HAVE_WAYLAND_BACKEND
struct wl_drm *wl_server_drm; /* for EGL_WL_bind_wayland_display */
#endif
};
struct drm_config {

5
src/gallium/state_trackers/egl/x11/native_dri2.c
View file

@ -60,9 +60,6 @@ struct dri2_display {
int num_configs;
struct util_hash_table *surfaces;
#ifdef HAVE_WAYLAND_BACKEND
struct wl_drm *wl_server_drm; /* for EGL_WL_bind_wayland_display */
#endif
};
struct dri2_surface {
@ -757,7 +754,9 @@ dri2_display_destroy(struct native_display *ndpy)
if (dri2dpy->surfaces)
util_hash_table_destroy(dri2dpy->surfaces);
#ifdef HAVE_WAYLAND_BACKEND
wayland_drm_bufmgr_destroy(ndpy->wayland_bufmgr);
#endif
if (dri2dpy->xscr)
x11_screen_destroy(dri2dpy->xscr);