Mesa (master): egl/wayland: Fix prefixes for interface names

Kristian Høgsberg krh at kemper.freedesktop.org
Fri Apr 22 06:01:02 PDT 2011


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

Author: Benjamin Franzke <benjaminfranzke at googlemail.com>
Date:   Thu Apr 21 09:39:25 2011 +0200

egl/wayland: Fix prefixes for interface names

---

 src/egl/drivers/dri2/platform_wayland.c            |    4 ++--
 .../wayland/wayland-drm/protocol/wayland-drm.xml   |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
index 62b2eab..c3dee7f 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -667,10 +667,10 @@ dri2_initialize_wayland(_EGLDriver *drv, _EGLDisplay *disp)
    disp->DriverData = (void *) dri2_dpy;
    dri2_dpy->wl_dpy = disp->PlatformDisplay;
 
-   id = wl_display_get_global(dri2_dpy->wl_dpy, "drm", 1);
+   id = wl_display_get_global(dri2_dpy->wl_dpy, "wl_drm", 1);
    if (id == 0)
       wl_display_iterate(dri2_dpy->wl_dpy, WL_DISPLAY_READABLE);
-   id = wl_display_get_global(dri2_dpy->wl_dpy, "drm", 1);
+   id = wl_display_get_global(dri2_dpy->wl_dpy, "wl_drm", 1);
    if (id == 0)
       goto cleanup_dpy;
    dri2_dpy->wl_drm = wl_drm_create(dri2_dpy->wl_dpy, id, 1);
diff --git a/src/egl/wayland/wayland-drm/protocol/wayland-drm.xml b/src/egl/wayland/wayland-drm/protocol/wayland-drm.xml
index 46725d8..cd5d191 100644
--- a/src/egl/wayland/wayland-drm/protocol/wayland-drm.xml
+++ b/src/egl/wayland/wayland-drm/protocol/wayland-drm.xml
@@ -2,7 +2,7 @@
 <protocol name="drm">
   <!-- drm support. This object is created by the server and published
        using the display's global event. -->
-  <interface name="drm" version="1">
+  <interface name="wl_drm" version="1">
     <!-- Call this request with the magic received from drmGetMagic().
          It will be passed on to the drmAuthMagic() or
          DRIAuthConnection() call.  This authentication must be
@@ -14,12 +14,12 @@
     <!-- Create a wayland buffer for the named DRM buffer.  The DRM
          surface must have a name using the flink ioctl -->
     <request name="create_buffer">
-      <arg name="id" type="new_id" interface="buffer"/>
+      <arg name="id" type="new_id" interface="wl_buffer"/>
       <arg name="name" type="uint"/>
       <arg name="width" type="int"/>
       <arg name="height" type="int"/>
       <arg name="stride" type="uint"/>
-      <arg name="visual" type="object" interface="visual"/>
+      <arg name="visual" type="object" interface="wl_visual"/>
     </request>
 
     <!-- Notification of the path of the drm device which is used by



More information about the mesa-commit mailing list