diff options
author | marha <marha@users.sourceforge.net> | 2010-01-14 17:14:58 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-01-14 17:14:58 +0000 |
commit | 8bbcd844049eb1296ccd25aca75bf3b08f28facb (patch) | |
tree | a4b168a1b2c686548550719b094e982124696f3d /xorg-server/glx/glxcontext.h | |
parent | 5eaf49ad7feec1f2043ecb1b90c04c534ce29f46 (diff) | |
parent | b152ebf4b66368e1cbfda1ae81cef29bf9c00bb7 (diff) | |
download | vcxsrv-8bbcd844049eb1296ccd25aca75bf3b08f28facb.tar.gz vcxsrv-8bbcd844049eb1296ccd25aca75bf3b08f28facb.tar.bz2 vcxsrv-8bbcd844049eb1296ccd25aca75bf3b08f28facb.zip |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/glx/glxcontext.h')
-rw-r--r-- | xorg-server/glx/glxcontext.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xorg-server/glx/glxcontext.h b/xorg-server/glx/glxcontext.h index 70a14115d..79bc083a8 100644 --- a/xorg-server/glx/glxcontext.h +++ b/xorg-server/glx/glxcontext.h @@ -55,6 +55,10 @@ struct __GLXcontext { unsigned long mask); int (*forceCurrent) (__GLXcontext *context); + Bool (*wait) (__GLXcontext *context, + __GLXclientState *cl, + int *error); + __GLXtextureFromPixmap *textureFromPixmap; /* |