Module: Mesa
Branch: 9.1
Commit: 5412ae63dca1b1a6c43fccb5bafe56a0cd9c9a88
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5412ae63dca1b1a6c43fccb5bafe56a0cd9c9a88

Author: Kristian Høgsberg <[email protected]>
Date:   Tue Jun 18 16:53:46 2013 -0400

wayland: Handle global_remove event as well

We need to set up a handler for the global_remove event that gets sent
out when a global gets removed.  Without the handler we end up calling
a NULL pointer.

https://bugs.freedesktop.org/show_bug.cgi?id=65910

NOTE: This is a candidate for the stable branches.

Signed-off-by: Kristian Høgsberg <[email protected]>
(cherry picked from commit 712269d6744a8849d1d0cf01fa0132d969b79ed4)

---

 src/egl/drivers/dri2/platform_wayland.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/egl/drivers/dri2/platform_wayland.c 
b/src/egl/drivers/dri2/platform_wayland.c
index 99d8729..e106dc2 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -643,8 +643,15 @@ registry_handle_global(void *data, struct wl_registry 
*registry, uint32_t name,
    }
 }
 
+static void
+registry_handle_global_remove(void *data, struct wl_registry *registry,
+                             uint32_t name)
+{
+}
+
 static const struct wl_registry_listener registry_listener = {
-       registry_handle_global
+   registry_handle_global,
+   registry_handle_global_remove
 };
 
 EGLBoolean

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to