diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-15 08:55:18 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-15 08:55:18 +0200 |
| commit | d6f64084b9bc07d0bdd527f9354f2d1d962ed16d (patch) | |
| tree | 81b2652d421992fd63143a04885e332e83e18d07 /xorg-server/glx/glxscreens.h | |
| parent | 669b562a737c9418c53bfae69c0dbf1aabe318b4 (diff) | |
| parent | 7a2af605c2c2b0d2e9bbb0b161eba8842acefbcb (diff) | |
| download | vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.tar.gz vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.tar.bz2 vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
fontconfig/src/fcint.h
fontconfig/src/fcstat.c
mesalib/src/mapi/glapi/gen/GL3x.xml
xorg-server/glx/glxext.h
Diffstat (limited to 'xorg-server/glx/glxscreens.h')
| -rw-r--r-- | xorg-server/glx/glxscreens.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/xorg-server/glx/glxscreens.h b/xorg-server/glx/glxscreens.h index 172268b29..b29df58a5 100644 --- a/xorg-server/glx/glxscreens.h +++ b/xorg-server/glx/glxscreens.h @@ -117,7 +117,10 @@ struct __GLXscreen { __GLXcontext *(*createContext) (__GLXscreen * screen, __GLXconfig * modes, - __GLXcontext * shareContext); + __GLXcontext * shareContext, + unsigned num_attribs, + const uint32_t *attribs, + int *error); __GLXdrawable *(*createDrawable) (ClientPtr client, __GLXscreen * context, |