glx: Deliver an xlib style error to the application from an XCB error

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>

diff --git a/src/glx/glx_error.c b/src/glx/glx_error.c
index 0855c35951a4e00923416f789c8b70f270fac913..b3860db2e3745bb64f0be8999b6b1b90cd0cbfde 100644 (file)
--- a/src/glx/glx_error.c
+++ b/src/glx/glx_error.c
@@ -65,3 +65,22 @@ __glXSendError(Display * dpy, int_fast8_t errorCode, uint_fast32_t resourceID,
 
    UnlockDisplay(dpy);
 }
+
+void
+__glXSendErrorForXcb(Display * dpy, const xcb_generic_error_t *err)
+{
+   xError error;
+
+   LockDisplay(dpy);
+
+   error.type = X_Error;
+   error.errorCode = err->error_code;
+   error.sequenceNumber = err->sequence;
+   error.resourceID = err->resource_id;
+   error.minorCode = err->minor_code;
+   error.majorCode = err->major_code;
+
+   _XError(dpy, &error);
+
+   UnlockDisplay(dpy);
+}

diff --git a/src/glx/glx_error.h b/src/glx/glx_error.h
index 19be38b44253b68ecff93b6f0c8e1c779e023bb4..eaf6b814c5e46b4a198d1979c2ed3c1c2aea84ce 100644 (file)
--- a/src/glx/glx_error.h
+++ b/src/glx/glx_error.h
@@ -29,7 +29,11 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <X11/Xlib.h>
+#include <xcb/xcb.h>
 
 void __glXSendError(Display * dpy, int_fast8_t errorCode,
                    uint_fast32_t resourceID, uint_fast16_t minorCode,
                    bool coreX11error);
+
+_X_HIDDEN void __glXSendErrorForXcb(Display * dpy,
+                                   const xcb_generic_error_t *err);