Mesa (master): st/egl: track server side wayland changes

Chia-I Wu olv at kemper.freedesktop.org
Wed Sep 7 17:27:11 UTC 2011


Module: Mesa
Branch: master
Commit: b89bca6d8b84e7922f44258c41e37997775f98c9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b89bca6d8b84e7922f44258c41e37997775f98c9

Author: Chia-I Wu <olv at lunarg.com>
Date:   Wed Sep  7 21:42:56 2011 +0800

st/egl: track server side wayland changes

Follow changes in c661ecce1089000c3fca9a543713f8264221be50.

---

 .../state_trackers/egl/wayland/native_drm.c        |    2 +-
 .../state_trackers/egl/wayland/native_shm.c        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/state_trackers/egl/wayland/native_drm.c b/src/gallium/state_trackers/egl/wayland/native_drm.c
index e18a888..7a5b33a 100644
--- a/src/gallium/state_trackers/egl/wayland/native_drm.c
+++ b/src/gallium/state_trackers/egl/wayland/native_drm.c
@@ -169,7 +169,7 @@ wayland_drm_display_init_screen(struct native_display *ndpy)
    if (id == 0)
       return FALSE;
 
-   drmdpy->wl_drm = wl_drm_create(drmdpy->base.dpy, id, 1);
+   drmdpy->wl_drm = wl_display_bind(drmdpy->base.dpy, id, &wl_drm_interface);
    if (!drmdpy->wl_drm)
       return FALSE;
 
diff --git a/src/gallium/state_trackers/egl/wayland/native_shm.c b/src/gallium/state_trackers/egl/wayland/native_shm.c
index 1c07995..018fbe8 100644
--- a/src/gallium/state_trackers/egl/wayland/native_shm.c
+++ b/src/gallium/state_trackers/egl/wayland/native_shm.c
@@ -123,7 +123,7 @@ wayland_shm_display_init_screen(struct native_display *ndpy)
    if (id == 0)
       return FALSE;
 
-   shmdpy->wl_shm = wl_shm_create(shmdpy->base.dpy, id, 1);
+   shmdpy->wl_shm = wl_display_bind(shmdpy->base.dpy, id, &wl_shm_interface);
    if (!shmdpy->wl_shm)
       return FALSE;
 




More information about the mesa-commit mailing list