aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/glx/glxdriswrast.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-12-22 22:04:41 +0100
committermarha <marha@users.sourceforge.net>2013-12-22 22:06:29 +0100
commit66215bff25b8961e396ea4a3b1847ac668de3ff4 (patch)
tree64e98f6dabdd61a56aa92264176c07d1aa0807df /xorg-server/glx/glxdriswrast.c
parent1d03b6f684ab1ea6772f00058605a9ebb2910628 (diff)
downloadvcxsrv-66215bff25b8961e396ea4a3b1847ac668de3ff4.tar.gz
vcxsrv-66215bff25b8961e396ea4a3b1847ac668de3ff4.tar.bz2
vcxsrv-66215bff25b8961e396ea4a3b1847ac668de3ff4.zip
Solved compile problems due to latest merge
Diffstat (limited to 'xorg-server/glx/glxdriswrast.c')
-rw-r--r--xorg-server/glx/glxdriswrast.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/xorg-server/glx/glxdriswrast.c b/xorg-server/glx/glxdriswrast.c
index 23989be89..c569374af 100644
--- a/xorg-server/glx/glxdriswrast.c
+++ b/xorg-server/glx/glxdriswrast.c
@@ -51,6 +51,13 @@
#include "extension_string.h"
+/* RTLD_LOCAL is not defined on Cygwin */
+#ifdef __CYGWIN__
+#ifndef RTLD_LOCAL
+#define RTLD_LOCAL 0
+#endif
+#endif
+
typedef struct __GLXDRIscreen __GLXDRIscreen;
typedef struct __GLXDRIcontext __GLXDRIcontext;
typedef struct __GLXDRIdrawable __GLXDRIdrawable;
@@ -391,7 +398,7 @@ swrastGetImage(__DRIdrawable * draw,
}
static const __DRIswrastLoaderExtension swrastLoaderExtension = {
- {__DRI_SWRAST_LOADER, 1},
+ {__DRI_SWRAST_LOADER, __DRI_SWRAST_LOADER_VERSION},
swrastGetDrawableInfo,
swrastPutImage,
swrastGetImage
@@ -432,9 +439,6 @@ initializeExtensions(__GLXDRIscreen * screen)
extern Bool g_fswrastwgl;
-/* white lie */
-extern glx_func_ptr glXGetProcAddressARB(const char *);
-
static __GLXscreen *
__glXDRIscreenProbe(ScreenPtr pScreen)
{
@@ -458,9 +462,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
screen->driver = glxProbeDriver(driverName,
(void **) &screen->core,
- __DRI_CORE, 1,
+ __DRI_CORE, __DRI_CORE_VERSION,
(void **) &screen->swrast,
- __DRI_SWRAST, 1);
+ __DRI_SWRAST, __DRI_SWRAST_VERSION);
if (screen->driver == NULL) {
goto handle_error;
}
@@ -487,8 +491,6 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
screen->base.GLXmajor = 1;
screen->base.GLXminor = 4;
- __glXsetGetProcAddress(glXGetProcAddressARB);
-
LogMessage(X_INFO, "AIGLX: Loaded and initialized %s\n", driverName);
return &screen->base;