[PATCH] XQuartz GL: Fix __glXAquaScreenCreateDrawable prototype
Jeremy Huddleston
jeremyhu at apple.com
Tue May 11 09:09:56 PDT 2010
Fixes regression introduced in 9de0e31746d5f0d9d39d11c94ec3cbc04a9935fc
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
---
hw/xquartz/GL/indirect.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c
index ad9ebbd..8092cfa 100644
--- a/hw/xquartz/GL/indirect.c
+++ b/hw/xquartz/GL/indirect.c
@@ -169,7 +169,7 @@ void warn_func(void * p1, char *format, ...);
// some prototypes
static __GLXscreen * __glXAquaScreenProbe(ScreenPtr pScreen);
-static __GLXdrawable * __glXAquaScreenCreateDrawable(__GLXscreen *screen, DrawablePtr pDraw, int type, XID drawId, __GLXconfig *conf);
+static __GLXdrawable * __glXAquaScreenCreateDrawable(ClientPtr client, __GLXscreen *screen, DrawablePtr pDraw, XID drawId, int type, XID glxDrawId, __GLXconfig *conf);
static void __glXAquaContextDestroy(__GLXcontext *baseContext);
static int __glXAquaContextMakeCurrent(__GLXcontext *baseContext);
@@ -639,10 +639,12 @@ static void __glXAquaDrawableDestroy(__GLXdrawable *base) {
}
static __GLXdrawable *
-__glXAquaScreenCreateDrawable(__GLXscreen *screen,
+__glXAquaScreenCreateDrawable(ClientPtr client,
+ __GLXscreen *screen,
DrawablePtr pDraw,
- int type,
XID drawId,
+ int type,
+ XID glxDrawId,
__GLXconfig *conf) {
__GLXAquaDrawable *glxPriv;
@@ -653,7 +655,7 @@ __glXAquaScreenCreateDrawable(__GLXscreen *screen,
memset(glxPriv, 0, sizeof *glxPriv);
- if(!__glXDrawableInit(&glxPriv->base, screen, pDraw, type, drawId, conf)) {
+ if(!__glXDrawableInit(&glxPriv->base, screen, pDraw, type, glxDrawId, conf)) {
xfree(glxPriv);
return NULL;
}
--
1.7.1
More information about the xorg-devel
mailing list