fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 13:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

apple: Change from XExtDisplayInfo to struct glx_display

Browse source 
Fixes regression introduced by: ab434f6b76 and
                                c356f5867f

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 7cdf969527)
This commit is contained in:
Jeremy Huddleston 2011-06-05 19:26:19 -04:00
parent a6a5772250
commit 7c4cc8d2b9
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/glx/apple/glx_error.c
View file

@ -27,22 +27,24 @@
prior written authorization. prior written authorization.
*/ */
#include <stdbool.h> #include <stdbool.h>
#include <assert.h>
#include <X11/Xlibint.h> #include <X11/Xlibint.h>
#include <X11/extensions/extutil.h> #include <X11/extensions/extutil.h>
#include <X11/extensions/Xext.h> #include <X11/extensions/Xext.h>
#include "glxclient.h" #include "glxclient.h"
#include "glx_error.h" #include "glx_error.h"
extern XExtDisplayInfo *__glXFindDisplay(Display * dpy);
void void
__glXSendError(Display * dpy, int errorCode, unsigned long resourceID, __glXSendError(Display * dpy, int errorCode, unsigned long resourceID,
unsigned long minorCode, bool coreX11error) unsigned long minorCode, bool coreX11error)
{ {
XExtDisplayInfo *info = __glXFindDisplay(dpy); struct glx_display *glx_dpy = __glXInitialize(dpy);
struct glx_context *gc = __glXGetCurrentContext(); struct glx_context *gc = __glXGetCurrentContext();
xError error; xError error;
assert(glx_dpy);
assert(gc);
LockDisplay(dpy); LockDisplay(dpy);
error.type = X_Error; error.type = X_Error;
@ -51,7 +53,7 @@ __glXSendError(Display * dpy, int errorCode, unsigned long resourceID,
error.errorCode = errorCode; error.errorCode = errorCode;
} }
else { else {
error.errorCode = info->codes->first_error + errorCode; error.errorCode = glx_dpy->codes->first_error + errorCode;
} }
error.sequenceNumber = dpy->request; error.sequenceNumber = dpy->request;