diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-15 12:37:07 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-15 12:37:07 +0000 |
| commit | 8654ee514b4d79feec936501717a06892090d3b7 (patch) | |
| tree | 2787608c117268bc6ed9e399ea57b8e1d0aeb8e3 /xorg-server/glx/glxdri.c | |
| parent | eb405babefc73e25ab8b7e6229709f85ef6a67b1 (diff) | |
| download | vcxsrv-8654ee514b4d79feec936501717a06892090d3b7.tar.gz vcxsrv-8654ee514b4d79feec936501717a06892090d3b7.tar.bz2 vcxsrv-8654ee514b4d79feec936501717a06892090d3b7.zip | |
svn merge -r530:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/glx/glxdri.c')
| -rw-r--r-- | xorg-server/glx/glxdri.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xorg-server/glx/glxdri.c b/xorg-server/glx/glxdri.c index 910eb464e..7c5e781e6 100644 --- a/xorg-server/glx/glxdri.c +++ b/xorg-server/glx/glxdri.c @@ -38,6 +38,7 @@ #include <GL/gl.h>
#include <GL/internal/dri_interface.h>
+#include <GL/glxtokens.h>
#include <windowstr.h>
#include <os.h>
@@ -942,9 +943,6 @@ initializeExtensions(__GLXDRIscreen *screen) }
}
-extern __GLXconfig *
-glxConvertConfigs(const __DRIcoreExtension *core, const __DRIconfig **configs);
-
static __GLXscreen *
__glXDRIscreenProbe(ScreenPtr pScreen)
{
@@ -1134,7 +1132,8 @@ __glXDRIscreenProbe(ScreenPtr pScreen) goto handle_error;
}
- screen->base.fbconfigs = glxConvertConfigs(screen->core, driConfigs);
+ screen->base.fbconfigs = glxConvertConfigs(screen->core,
+ driConfigs, GLX_WINDOW_BIT);
initializeExtensions(screen);
|