From 6ae12ffad7479f690b5780213e8b52df6bbd15e6 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 12 May 2010 11:44:32 +0000 Subject: svn merge -r586:HEAD "^/branches/released" . --- xorg-server/glx/glxdri.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'xorg-server/glx/glxdri.c') diff --git a/xorg-server/glx/glxdri.c b/xorg-server/glx/glxdri.c index 7c5e781e6..4bb33bff3 100644 --- a/xorg-server/glx/glxdri.c +++ b/xorg-server/glx/glxdri.c @@ -686,10 +686,12 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen, } static __GLXdrawable * -__glXDRIscreenCreateDrawable(__GLXscreen *screen, +__glXDRIscreenCreateDrawable(ClientPtr client, + __GLXscreen *screen, DrawablePtr pDraw, - int type, XID drawId, + int type, + XID glxDrawId, __GLXconfig *glxConfig) { __GLXDRIscreen *driScreen = (__GLXDRIscreen *) screen; @@ -703,7 +705,7 @@ __glXDRIscreenCreateDrawable(__GLXscreen *screen, return NULL; if (!__glXDrawableInit(&private->base, screen, - pDraw, type, drawId, glxConfig)) { + pDraw, type, glxDrawId, glxConfig)) { xfree(private); return NULL; } -- cgit v1.2.3