aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-01-14 17:14:58 +0000
committermarha <marha@users.sourceforge.net>2010-01-14 17:14:58 +0000
commit8bbcd844049eb1296ccd25aca75bf3b08f28facb (patch)
treea4b168a1b2c686548550719b094e982124696f3d /xorg-server/hw/xwin
parent5eaf49ad7feec1f2043ecb1b90c04c534ce29f46 (diff)
parentb152ebf4b66368e1cbfda1ae81cef29bf9c00bb7 (diff)
downloadvcxsrv-8bbcd844049eb1296ccd25aca75bf3b08f28facb.tar.gz
vcxsrv-8bbcd844049eb1296ccd25aca75bf3b08f28facb.tar.bz2
vcxsrv-8bbcd844049eb1296ccd25aca75bf3b08f28facb.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xwin')
-rw-r--r--xorg-server/hw/xwin/glx/indirect.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/hw/xwin/glx/indirect.c b/xorg-server/hw/xwin/glx/indirect.c
index 66d9d98c1..70b257c12 100644
--- a/xorg-server/hw/xwin/glx/indirect.c
+++ b/xorg-server/hw/xwin/glx/indirect.c
@@ -895,7 +895,7 @@ glxWinDestroyWindow(WindowPtr pWin)
*/
static GLboolean
-glxWinDrawableSwapBuffers(__GLXdrawable *base)
+glxWinDrawableSwapBuffers(ClientPtr client, __GLXdrawable *base)
{
BOOL ret;
__GLXWinDrawable *draw = (__GLXWinDrawable *)base;
@@ -931,7 +931,7 @@ glxWinDrawableCopySubBuffer(__GLXdrawable *drawable,
int x, int y, int w, int h)
{
glAddSwapHintRectWINWrapperNonstatic(x, y, w, h);
- glxWinDrawableSwapBuffers(drawable);
+ glxWinDrawableSwapBuffers(NULL,drawable);
}
static void