diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-05 16:47:44 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-05 16:47:44 +0200 |
| commit | 8238de0fe0c28bd54b3e6cdd1fc94513cf21d3cc (patch) | |
| tree | e9adf557b0065c0936be2a1936eaa3033144ac74 /xorg-server/glx | |
| parent | 0e5ac4a92495c162590cedb58c6f6fc1d9ba199a (diff) | |
| download | vcxsrv-8238de0fe0c28bd54b3e6cdd1fc94513cf21d3cc.tar.gz vcxsrv-8238de0fe0c28bd54b3e6cdd1fc94513cf21d3cc.tar.bz2 vcxsrv-8238de0fe0c28bd54b3e6cdd1fc94513cf21d3cc.zip | |
Added swrast dll based on wgl
Diffstat (limited to 'xorg-server/glx')
| -rw-r--r-- | xorg-server/glx/glxdriswrast.c | 9 | ||||
| -rw-r--r-- | xorg-server/glx/glxext.h | 8 |
2 files changed, 15 insertions, 2 deletions
diff --git a/xorg-server/glx/glxdriswrast.c b/xorg-server/glx/glxdriswrast.c index 519b136e4..4aa1302e7 100644 --- a/xorg-server/glx/glxdriswrast.c +++ b/xorg-server/glx/glxdriswrast.c @@ -422,12 +422,19 @@ initializeExtensions(__GLXDRIscreen *screen) }
}
+extern Bool g_fswrastwgl;
+
static __GLXscreen *
__glXDRIscreenProbe(ScreenPtr pScreen)
{
- const char *driverName = "swrast";
+ const char *driverName;
__GLXDRIscreen *screen;
const __DRIconfig **driConfigs;
+
+ if (g_fswrastwgl)
+ driverName = "swrastwgl";
+ else
+ driverName = "swrast";
screen = calloc(1, sizeof *screen);
if (screen == NULL)
diff --git a/xorg-server/glx/glxext.h b/xorg-server/glx/glxext.h index 7008c4763..e76207910 100644 --- a/xorg-server/glx/glxext.h +++ b/xorg-server/glx/glxext.h @@ -35,11 +35,17 @@ * Silicon Graphics, Inc. */ +#ifdef INSERVER +#define SERVEXTERN _declspec(dllimport) +#else +#define SERVEXTERN _declspec(dllexport) +#endif + extern GLboolean __glXFreeContext(__GLXcontext *glxc); extern void __glXFlushContextCache(void); extern void __glXAddToContextList(__GLXcontext *cx); -extern void __glXErrorCallBack(GLenum code); +SERVEXTERN void __glXErrorCallBack(GLenum code); extern void __glXClearErrorOccured(void); extern GLboolean __glXErrorOccured(void); extern void __glXResetLargeCommandStatus(__GLXclientState*); |