summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2019-05-07 13:55:32 +1000
committerTimothy Arceri <[email protected]>2019-05-08 13:16:44 +1000
commita01b393c397c846345f03f76f1167dd667e0ee96 (patch)
tree19b37247307f8694d773b464a56a13a1cbf76697
parent024232b26c203d593533e488b5131e7a787b2ac1 (diff)
Revert "glx: Fix synthetic error generation in __glXSendError"
This reverts commit e91ee763c378d03883eb88cf0eadd8aa916f7878. This seems to have broken a number of wine games. Lets revert everything for now and try again later. Acked-by: Adam Jackson <[email protected]> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110632 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110590
-rw-r--r--src/glx/glx_error.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glx/glx_error.c b/src/glx/glx_error.c
index 712ecf8213d..653cbeb2d2a 100644
--- a/src/glx/glx_error.c
+++ b/src/glx/glx_error.c
@@ -54,7 +54,7 @@ __glXSendError(Display * dpy, int_fast8_t errorCode, uint_fast32_t resourceID,
error.errorCode = glx_dpy->codes->first_error + errorCode;
}
- error.sequenceNumber = dpy->last_request_read;
+ error.sequenceNumber = dpy->request;
error.resourceID = resourceID;
error.minorCode = minorCode;
error.majorCode = glx_dpy->majorOpcode;
@@ -73,7 +73,7 @@ __glXSendErrorForXcb(Display * dpy, const xcb_generic_error_t *err)
error.type = X_Error;
error.errorCode = err->error_code;
- error.sequenceNumber = dpy->last_request_read;
+ error.sequenceNumber = err->sequence;
error.resourceID = err->resource_id;
error.minorCode = err->minor_code;
error.majorCode = err->major_code;