aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-05-12 11:44:32 +0000
committermarha <marha@users.sourceforge.net>2010-05-12 11:44:32 +0000
commit6ae12ffad7479f690b5780213e8b52df6bbd15e6 (patch)
tree3fc6a56c166a0e896a012a4c82fe98a78e605d41 /xorg-server/hw/xwin
parent820f57fadfe7d14e01e0284ff8a23298a0f59b20 (diff)
downloadvcxsrv-6ae12ffad7479f690b5780213e8b52df6bbd15e6.tar.gz
vcxsrv-6ae12ffad7479f690b5780213e8b52df6bbd15e6.tar.bz2
vcxsrv-6ae12ffad7479f690b5780213e8b52df6bbd15e6.zip
svn merge -r586:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/hw/xwin')
-rw-r--r--xorg-server/hw/xwin/glx/indirect.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/xorg-server/hw/xwin/glx/indirect.c b/xorg-server/hw/xwin/glx/indirect.c
index 098973ca3..48094a69e 100644
--- a/xorg-server/hw/xwin/glx/indirect.c
+++ b/xorg-server/hw/xwin/glx/indirect.c
@@ -415,10 +415,12 @@ static __GLXscreen *glxWinScreenProbe(ScreenPtr pScreen);
static __GLXcontext *glxWinCreateContext(__GLXscreen *screen,
__GLXconfig *modes,
__GLXcontext *baseShareContext);
-static __GLXdrawable *glxWinCreateDrawable(__GLXscreen *screen,
+static __GLXdrawable *glxWinCreateDrawable(ClientPtr client,
+ __GLXscreen *screen,
DrawablePtr pDraw,
- int type,
XID drawId,
+ int type,
+ XID glxDrawId,
__GLXconfig *conf);
static Bool glxWinRealizeWindow(WindowPtr pWin);
@@ -1026,11 +1028,13 @@ glxWinDrawableDestroy(__GLXdrawable *base)
}
static __GLXdrawable *
-glxWinCreateDrawable(__GLXscreen *screen,
- DrawablePtr pDraw,
- int type,
- XID drawId,
- __GLXconfig *conf)
+glxWinCreateDrawable(ClientPtr client,
+ __GLXscreen *screen,
+ DrawablePtr pDraw,
+ XID drawId,
+ int type,
+ XID glxDrawId,
+ __GLXconfig *conf)
{
__GLXWinDrawable *glxPriv;
@@ -1039,7 +1043,7 @@ glxWinCreateDrawable(__GLXscreen *screen,
if (glxPriv == NULL)
return NULL;
- if(!__glXDrawableInit(&glxPriv->base, screen, pDraw, type, drawId, conf)) {
+ if(!__glXDrawableInit(&glxPriv->base, screen, pDraw, type, glxDrawId, conf)) {
xfree(glxPriv);
return NULL;
}