diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-12 11:44:32 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-12 11:44:32 +0000 |
| commit | 6ae12ffad7479f690b5780213e8b52df6bbd15e6 (patch) | |
| tree | 3fc6a56c166a0e896a012a4c82fe98a78e605d41 /xorg-server/glx/glxdriswrast.c | |
| parent | 820f57fadfe7d14e01e0284ff8a23298a0f59b20 (diff) | |
| download | vcxsrv-6ae12ffad7479f690b5780213e8b52df6bbd15e6.tar.gz vcxsrv-6ae12ffad7479f690b5780213e8b52df6bbd15e6.tar.bz2 vcxsrv-6ae12ffad7479f690b5780213e8b52df6bbd15e6.zip | |
svn merge -r586:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/glx/glxdriswrast.c')
| -rw-r--r-- | xorg-server/glx/glxdriswrast.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/xorg-server/glx/glxdriswrast.c b/xorg-server/glx/glxdriswrast.c index cfac16133..3852b5243 100644 --- a/xorg-server/glx/glxdriswrast.c +++ b/xorg-server/glx/glxdriswrast.c @@ -313,10 +313,12 @@ glxChangeGC(GCPtr gc, BITS32 mask, CARD32 val) }
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;
@@ -331,7 +333,7 @@ __glXDRIscreenCreateDrawable(__GLXscreen *screen, private->screen = driScreen;
if (!__glXDrawableInit(&private->base, screen,
- pDraw, type, drawId, glxConfig)) {
+ pDraw, type, glxDrawId, glxConfig)) {
xfree(private);
return NULL;
}
|