aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/glx
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-12-15 20:47:16 +0000
committermarha <marha@users.sourceforge.net>2009-12-15 20:47:16 +0000
commit21a4e26f75e0bcd0559a6bd8fc76600a51f76bfb (patch)
tree221c8af9c50c250bcd5cf42897374cda727e40fe /xorg-server/glx
parentc915fe74ff1b1d02f7506a187bc9b588f5c21f97 (diff)
downloadvcxsrv-21a4e26f75e0bcd0559a6bd8fc76600a51f76bfb.tar.gz
vcxsrv-21a4e26f75e0bcd0559a6bd8fc76600a51f76bfb.tar.bz2
vcxsrv-21a4e26f75e0bcd0559a6bd8fc76600a51f76bfb.zip
Debug version of vcxsrv should use debug version of swrast_dri.dll and vice versa
Diffstat (limited to 'xorg-server/glx')
-rw-r--r--xorg-server/glx/glxdriswrast.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/xorg-server/glx/glxdriswrast.c b/xorg-server/glx/glxdriswrast.c
index 1bc385b86..5ff18a574 100644
--- a/xorg-server/glx/glxdriswrast.c
+++ b/xorg-server/glx/glxdriswrast.c
@@ -471,8 +471,13 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
screen->base.pScreen = pScreen;
#ifdef _MSC_VER
+#ifdef _DEBUG
+#define DLLNAME "%s%s_dri_dbg.dll"
+#else
+#define DLLNAME "%s%s_dri.dll"
+#endif
snprintf(filename, sizeof filename,
- "%s%s_dri.dll", dri_driver_path, driverName);
+ DLLNAME, dri_driver_path, driverName);
screen->driver = LoadLibrary(filename);
#else
@@ -488,7 +493,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
}
#ifdef _MSC_VER
- extensions = GetProcAddress(screen->driver, __DRI_DRIVER_EXTENSIONS);
+ extensions = (const __DRIextension **)GetProcAddress(screen->driver, __DRI_DRIVER_EXTENSIONS);
#else
extensions = dlsym(screen->driver, __DRI_DRIVER_EXTENSIONS);
#endif
@@ -532,6 +537,8 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
screen->base.fbconfigs = glxConvertConfigs(screen->core, driConfigs);
__glXScreenInit(&screen->base, pScreen);
+ screen->base.GLXmajor = 1;
+ screen->base.GLXminor = 4;
LogMessage(X_INFO,
"AIGLX: Loaded and initialized %s\n", filename);