aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/glx/glxdri.c
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/glx/glxdri.c
parent820f57fadfe7d14e01e0284ff8a23298a0f59b20 (diff)
downloadvcxsrv-6ae12ffad7479f690b5780213e8b52df6bbd15e6.tar.gz
vcxsrv-6ae12ffad7479f690b5780213e8b52df6bbd15e6.tar.bz2
vcxsrv-6ae12ffad7479f690b5780213e8b52df6bbd15e6.zip
svn merge -r586:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/glx/glxdri.c')
-rw-r--r--xorg-server/glx/glxdri.c8
1 files changed, 5 insertions, 3 deletions
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;
}