aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/glx/glxdri.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-04-15 07:50:39 +0000
committermarha <marha@users.sourceforge.net>2010-04-15 07:50:39 +0000
commit6412df1b3df28c6213b43821c4a98cc3857d9a3f (patch)
treed26e725c65f2166ac78d4ee4e56176712a563483 /xorg-server/glx/glxdri.c
parentb71f397671d4b467bfac21f208d54d2dc507969c (diff)
downloadvcxsrv-6412df1b3df28c6213b43821c4a98cc3857d9a3f.tar.gz
vcxsrv-6412df1b3df28c6213b43821c4a98cc3857d9a3f.tar.bz2
vcxsrv-6412df1b3df28c6213b43821c4a98cc3857d9a3f.zip
Git update 15/4/2010
Diffstat (limited to 'xorg-server/glx/glxdri.c')
-rw-r--r--xorg-server/glx/glxdri.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/xorg-server/glx/glxdri.c b/xorg-server/glx/glxdri.c
index 21e44d12d..9810a73a7 100644
--- a/xorg-server/glx/glxdri.c
+++ b/xorg-server/glx/glxdri.c
@@ -35,6 +35,7 @@
#include <drm.h>
#include <GL/gl.h>
#include <GL/internal/dri_interface.h>
+#include <GL/glxtokens.h>
#include <windowstr.h>
#include <os.h>
@@ -939,9 +940,6 @@ initializeExtensions(__GLXDRIscreen *screen)
}
}
-extern __GLXconfig *
-glxConvertConfigs(const __DRIcoreExtension *core, const __DRIconfig **configs);
-
static __GLXscreen *
__glXDRIscreenProbe(ScreenPtr pScreen)
{
@@ -1131,7 +1129,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);