diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-30 20:51:05 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-30 20:51:05 +0000 |
| commit | 70a13fe295183aeea369adcb94f2d67e69fab387 (patch) | |
| tree | d707644ab424d0517a879b9784a543a899e1ae20 /xorg-server/glx/glxscreens.h | |
| parent | 9b51ee5bcf948185cfcba0600b3da2d241339174 (diff) | |
| parent | 140242b0d4aed1d595d6565d088d9567c456d6b4 (diff) | |
| download | vcxsrv-70a13fe295183aeea369adcb94f2d67e69fab387.tar.gz vcxsrv-70a13fe295183aeea369adcb94f2d67e69fab387.tar.bz2 vcxsrv-70a13fe295183aeea369adcb94f2d67e69fab387.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/glx/glxscreens.h')
| -rw-r--r-- | xorg-server/glx/glxscreens.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xorg-server/glx/glxscreens.h b/xorg-server/glx/glxscreens.h index e39034243..0fb0fd17d 100644 --- a/xorg-server/glx/glxscreens.h +++ b/xorg-server/glx/glxscreens.h @@ -115,9 +115,9 @@ typedef struct __GLXscreen __GLXscreen; struct __GLXscreen {
void (*destroy) (__GLXscreen *screen);
- struct glx_context *(*createContext) (__GLXscreen *screen,
+ __GLXcontext *(*createContext) (__GLXscreen *screen,
__GLXconfig *modes,
- struct glx_context *shareContext);
+ __GLXcontext *shareContext);
__GLXdrawable *(*createDrawable)(ClientPtr client,
__GLXscreen *context,
@@ -142,6 +142,7 @@ struct __GLXscreen { char *GLextensions;
char *GLXvendor;
+ char *GLXversion;
char *GLXextensions;
/**
|