aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xorg-server/glx/glxdriswrast.c11
-rw-r--r--xorg-server/makefile5
2 files changed, 13 insertions, 3 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);
diff --git a/xorg-server/makefile b/xorg-server/makefile
index c9b9e7e62..cdd9927a8 100644
--- a/xorg-server/makefile
+++ b/xorg-server/makefile
@@ -125,13 +125,16 @@ load_makefile xkbdata.src\makefile MAKESERVER=0 DEBUG=0
all: $(APP).exe xlaunch.exe xkbcomp.exe protocol.txt XKeysymDB XErrorDB \
..\libX11\nls\all fonts.src\all xkbdata.src\all plink.exe xclock.exe xcalc.exe \
- xwininfo.exe swrast_dri.dll
+ xwininfo.exe swrast_dri.dll swrast_dri_dbg.dll
load_makefile ..\mesalib\windows\VC8\mesa\makefile MAKESERVER=0 DEBUG=0
swrast_dri.dll: ..\mesalib\windows\VC8\mesa\Release\swrast_dri.dll
copy $< $@
+swrast_dri_dbg.dll: ..\mesalib\windows\VC8\mesa\Debug\swrast_dri.dll
+ copy $< $@
+
mesaopengl32.dll: ..\mesalib\lib\mesaopengl32.dll
copy $< $@