Changes for VC compilation

32 files changed, 196 insertions, 1 deletions

diff --git a/xorg-server/glx/glapi.h b/xorg-server/glx/glapi.h
index ddfb1cffb..697337ea0 100644
--- a/xorg-server/glx/glapi.h
+++ b/xorg-server/glx/glapi.h
@@ -46,6 +46,7 @@
 
 
 #include "GL/gl.h"
+#include "GL/glext.h"
 #include "glapitable.h"
 #include "glthread.h"
 
diff --git a/xorg-server/glx/glheader.h b/xorg-server/glx/glheader.h
new file mode 100644
index 000000000..1c0ee2c9e
--- /dev/null
+++ b/xorg-server/glx/glheader.h
@@ -0,0 +1,24 @@
+#ifndef __GLHEADER_H__

+#define __GLHEADER_H__

+

+#define STDC_HEADERS 1

+

+#include <X11/Xwinsock.h>

+#include <X11/Xwindows.h>

+#include <assert.h>

+#define strcasecmp _stricmp

+

+#undef MINSHORT

+#undef MAXSHORT

+

+#define MINSHORT -32768

+#define MAXSHORT 32767

+

+#define PUBLIC

+

+#define GL_GLEXT_PROTOTYPES

+

+#define DRI_DRIVER_PATH "/usr/lib/dri"

+

+#endif

+

diff --git a/xorg-server/glx/glxcmds.c b/xorg-server/glx/glxcmds.c
index 95221a729..2181170ef 100644
--- a/xorg-server/glx/glxcmds.c
+++ b/xorg-server/glx/glxcmds.c
@@ -37,6 +37,10 @@
 #define FONT_PCF
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include <string.h>
diff --git a/xorg-server/glx/glxcmdsswap.c b/xorg-server/glx/glxcmdsswap.c
index 7f17c263b..cb34a11c7 100644
--- a/xorg-server/glx/glxcmdsswap.c
+++ b/xorg-server/glx/glxcmdsswap.c
@@ -37,6 +37,10 @@
 #define FONT_PCF
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include <string.h>
diff --git a/xorg-server/glx/glxdri.c b/xorg-server/glx/glxdri.c
index 52a97d4c4..f76a0ce44 100644
--- a/xorg-server/glx/glxdri.c
+++ b/xorg-server/glx/glxdri.c
@@ -29,10 +29,13 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#ifndef _MSC_VER
 #include <sys/time.h>
 #include <dlfcn.h>
 
 #include <drm.h>
+#endif
+
 #include <GL/gl.h>
 #include <GL/internal/dri_interface.h>
 
diff --git a/xorg-server/glx/glxdricommon.c b/xorg-server/glx/glxdricommon.c
index faaa3b7ae..028c77842 100644
--- a/xorg-server/glx/glxdricommon.c
+++ b/xorg-server/glx/glxdricommon.c
@@ -25,6 +25,10 @@
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include <stdint.h>
@@ -47,12 +51,16 @@ getUST(int64_t *ust)
     if (ust == NULL)
 	return -EFAULT;
 
+#ifdef _MSC_VER
+    __asm int 3;
+#else
     if (gettimeofday(&tv, NULL) == 0) {
 	ust[0] = (tv.tv_sec * 1000000) + tv.tv_usec;
 	return 0;
     } else {
 	return -errno;
     }
+    #endif
 }
 
 const __DRIsystemTimeExtension systemTimeExtension = {
diff --git a/xorg-server/glx/glxdriswrast.c b/xorg-server/glx/glxdriswrast.c
index f36dae739..a1bd4032b 100644
--- a/xorg-server/glx/glxdriswrast.c
+++ b/xorg-server/glx/glxdriswrast.c
@@ -26,6 +26,10 @@
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include <stdint.h>
@@ -55,6 +59,14 @@
 #include "dispatch.h"
 #include "extension_string.h"
 
+#ifndef RTLD_LOCAL
+#define RTLD_LOCAL 0
+#endif
+
+#ifdef _MSC_VER
+#define dlerror() "Getting loadlibrary error string not implemented"
+#endif
+
 typedef struct __GLXDRIscreen   __GLXDRIscreen;
 typedef struct __GLXDRIcontext  __GLXDRIcontext;
 typedef struct __GLXDRIdrawable __GLXDRIdrawable;
@@ -252,7 +264,11 @@ __glXDRIscreenDestroy(__GLXscreen *baseScreen)
 
     (*screen->core->destroyScreen)(screen->driScreen);
 
+#ifdef _MSC_VER
+    FreeLibrary(screen->driver);
+#else
     dlclose(screen->driver);
+#endif
 
     __glXScreenDestroy(baseScreen);
 
@@ -473,14 +489,22 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
     snprintf(filename, sizeof filename,
 	     "%s/%s_dri.so", dri_driver_path, driverName);
 
+#ifdef _MSC_VER
+    screen->driver = LoadLibrary(filename);
+#else
     screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
+#endif
     if (screen->driver == NULL) {
 	LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n",
 		   filename, dlerror());
         goto handle_error;
     }
 
+#ifdef _MSC_VER
+    extensions = GetProcAddress(screen->driver, __DRI_DRIVER_EXTENSIONS);
+#else
     extensions = dlsym(screen->driver, __DRI_DRIVER_EXTENSIONS);
+#endif
     if (extensions == NULL) {
 	LogMessage(X_ERROR, "AIGLX error: %s exports no extensions (%s)\n",
 		   driverName, dlerror());
@@ -528,7 +552,11 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
 
  handle_error:
     if (screen->driver)
+#ifdef _MSC_VER
+    FreeLibrary(screen->driver);
+#else
         dlclose(screen->driver);
+#endif
 
     xfree(screen);
 
diff --git a/xorg-server/glx/glxext.c b/xorg-server/glx/glxext.c
index 6ba404fb1..c7784ad10 100644
--- a/xorg-server/glx/glxext.c
+++ b/xorg-server/glx/glxext.c
@@ -21,6 +21,10 @@
 #define NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include <string.h>
diff --git a/xorg-server/glx/glxscreens.c b/xorg-server/glx/glxscreens.c
index f4839b32c..bda649e46 100644
--- a/xorg-server/glx/glxscreens.c
+++ b/xorg-server/glx/glxscreens.c
@@ -35,6 +35,10 @@
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include <GL/glxtokens.h>
diff --git a/xorg-server/glx/glxserver.h b/xorg-server/glx/glxserver.h
index 518868981..0cc54c773 100644
--- a/xorg-server/glx/glxserver.h
+++ b/xorg-server/glx/glxserver.h
@@ -59,6 +59,7 @@
 
 #define GL_GLEXT_PROTOTYPES /* we want prototypes */
 #include <GL/gl.h>
+#include <GL/glext.h>
 #include <GL/glxproto.h>
 #include <GL/glxint.h>
 
diff --git a/xorg-server/glx/glxutil.c b/xorg-server/glx/glxutil.c
index fc73a02c9..ab39f27f2 100644
--- a/xorg-server/glx/glxutil.c
+++ b/xorg-server/glx/glxutil.c
@@ -37,6 +37,10 @@
 #define FONT_PCF
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include <string.h>
diff --git a/xorg-server/glx/indirect_dispatch.c b/xorg-server/glx/indirect_dispatch.c
index 2afd3eb22..fac726805 100644
--- a/xorg-server/glx/indirect_dispatch.c
+++ b/xorg-server/glx/indirect_dispatch.c
@@ -24,6 +24,13 @@
  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#else
+
+#include "glheader.h"
+
+#endif
 
 #include <X11/Xmd.h>
 #include <GL/gl.h>
diff --git a/xorg-server/glx/indirect_dispatch_swap.c b/xorg-server/glx/indirect_dispatch_swap.c
index f137cbe98..afced8bc1 100644
--- a/xorg-server/glx/indirect_dispatch_swap.c
+++ b/xorg-server/glx/indirect_dispatch_swap.c
@@ -24,6 +24,13 @@
  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#else
+
+#include "glheader.h"
+
+#endif
 
 #include <X11/Xmd.h>
 #include <GL/gl.h>
diff --git a/xorg-server/glx/indirect_program.c b/xorg-server/glx/indirect_program.c
index d23a0a9e6..421d9a0cb 100644
--- a/xorg-server/glx/indirect_program.c
+++ b/xorg-server/glx/indirect_program.c
@@ -32,6 +32,10 @@
 #define NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include "glxserver.h"
diff --git a/xorg-server/glx/indirect_reqsize.c b/xorg-server/glx/indirect_reqsize.c
index 954eecd97..44a53c5f2 100644
--- a/xorg-server/glx/indirect_reqsize.c
+++ b/xorg-server/glx/indirect_reqsize.c
@@ -25,6 +25,13 @@
  * SOFTWARE.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#else
+
+#include "glheader.h"
+
+#endif
 
 #include <GL/gl.h>
 #include "glxserver.h"
diff --git a/xorg-server/glx/indirect_size_get.c b/xorg-server/glx/indirect_size_get.c
index 8f726904f..aacb76a2b 100644
--- a/xorg-server/glx/indirect_size_get.c
+++ b/xorg-server/glx/indirect_size_get.c
@@ -25,6 +25,13 @@
  * SOFTWARE.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#else
+
+#include "glheader.h"
+
+#endif
 
 #include <GL/gl.h>
 #include "indirect_size_get.h"
@@ -877,7 +884,9 @@ __glGetTexLevelParameterfv_size(GLenum e)
     case GL_TEXTURE_INTENSITY_SIZE:
 /*      case GL_TEXTURE_INTENSITY_SIZE_EXT:*/
     case GL_TEXTURE_DEPTH:
+#ifndef _MSC_VER
     case GL_TEXTURE_INDEX_SIZE_EXT:
+#endif
     case GL_TEXTURE_COMPRESSED_IMAGE_SIZE:
 /*      case GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB:*/
     case GL_TEXTURE_COMPRESSED:
diff --git a/xorg-server/glx/indirect_table.c b/xorg-server/glx/indirect_table.c
index cb3202605..b5ac86a5a 100644
--- a/xorg-server/glx/indirect_table.c
+++ b/xorg-server/glx/indirect_table.c
@@ -25,6 +25,10 @@
  * SOFTWARE.
  */
 
+#ifndef HAVE_DIX_CONFIG_H
+#include "glheader.h"
+#endif
+
 #include <inttypes.h>
 #include "glxserver.h"
 #include "glxext.h"
diff --git a/xorg-server/glx/indirect_texture_compression.c b/xorg-server/glx/indirect_texture_compression.c
index 3c09663fc..bae82c360 100644
--- a/xorg-server/glx/indirect_texture_compression.c
+++ b/xorg-server/glx/indirect_texture_compression.c
@@ -26,6 +26,10 @@
 #define NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include "glxserver.h"
diff --git a/xorg-server/glx/indirect_util.c b/xorg-server/glx/indirect_util.c
index 58c194c99..b2ecc2578 100644
--- a/xorg-server/glx/indirect_util.c
+++ b/xorg-server/glx/indirect_util.c
@@ -25,6 +25,10 @@
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include <string.h>
diff --git a/xorg-server/glx/makefile b/xorg-server/glx/makefile
new file mode 100644
index 000000000..8e595d7ab
--- /dev/null
+++ b/xorg-server/glx/makefile
@@ -0,0 +1,7 @@
+CSRCS=glapi.c glthread.c glxcmds.c glxcmdsswap.c glxdricommon.c glxext.c glxscreens.c glxutil.c \

+indirect_dispatch.c indirect_dispatch_swap.c indirect_program.c indirect_reqsize.c indirect_size_get.c indirect_table.c indirect_texture_compression.c \

+indirect_util.c render2.c render2swap.c renderpix.c renderpixswap.c rensize.c single2.c single2swap.c singlepix.c singlepixswap.c singlesize.c \

+swap_interval.c xfont.c glxdriswrast.c

+

+LIBRARY=libglx

+

diff --git a/xorg-server/glx/render2.c b/xorg-server/glx/render2.c
index 5b3d3e6d0..607b2d8ff 100644
--- a/xorg-server/glx/render2.c
+++ b/xorg-server/glx/render2.c
@@ -36,6 +36,10 @@
 /* #define NEED_REPLIES */
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include <glxserver.h>
diff --git a/xorg-server/glx/render2swap.c b/xorg-server/glx/render2swap.c
index 23b7ebd37..b0e87b021 100644
--- a/xorg-server/glx/render2swap.c
+++ b/xorg-server/glx/render2swap.c
@@ -36,6 +36,10 @@
 /* #define NEED_REPLIES */
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include "glxserver.h"
diff --git a/xorg-server/glx/renderpix.c b/xorg-server/glx/renderpix.c
index 2fe630193..6de93e3c3 100644
--- a/xorg-server/glx/renderpix.c
+++ b/xorg-server/glx/renderpix.c
@@ -36,6 +36,10 @@
 #define NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include "glxserver.h"
diff --git a/xorg-server/glx/renderpixswap.c b/xorg-server/glx/renderpixswap.c
index 8455807e6..7b2c605d3 100644
--- a/xorg-server/glx/renderpixswap.c
+++ b/xorg-server/glx/renderpixswap.c
@@ -36,6 +36,10 @@
 #define NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include "glxserver.h"
diff --git a/xorg-server/glx/rensize.c b/xorg-server/glx/rensize.c
index c69619a61..7d7c62719 100644
--- a/xorg-server/glx/rensize.c
+++ b/xorg-server/glx/rensize.c
@@ -35,6 +35,10 @@
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include <GL/gl.h>
@@ -224,7 +228,9 @@ int __glXImageSize( GLenum format, GLenum type, GLenum target,
 	  case GL_422_AVERAGE_EXT:
 	  case GL_422_REV_AVERAGE_EXT:
 	  case GL_DEPTH_STENCIL_NV:
+#ifndef _MSC_VER
 	  case GL_DEPTH_STENCIL_MESA:
+#endif
 	  case GL_YCBCR_MESA:
 	  case GL_LUMINANCE_ALPHA:
 	    elementsPerGroup = 2;
@@ -263,11 +269,13 @@ int __glXImageSize( GLenum format, GLenum type, GLenum target,
 	  case GL_UNSIGNED_SHORT_1_5_5_5_REV:
 	  case GL_UNSIGNED_SHORT_8_8_APPLE:
 	  case GL_UNSIGNED_SHORT_8_8_REV_APPLE:
+#ifndef _MSC_VER
 	  case GL_UNSIGNED_SHORT_15_1_MESA:
 	  case GL_UNSIGNED_SHORT_1_15_REV_MESA:
 	    bytesPerElement = 2;
 	    elementsPerGroup = 1;
 	    break;
+#endif
 	  case GL_INT:
 	  case GL_UNSIGNED_INT:
 	  case GL_FLOAT:
@@ -278,8 +286,10 @@ int __glXImageSize( GLenum format, GLenum type, GLenum target,
 	  case GL_UNSIGNED_INT_10_10_10_2:
 	  case GL_UNSIGNED_INT_2_10_10_10_REV:
 	  case GL_UNSIGNED_INT_24_8_NV:
+#ifndef _MSC_VER
 	  case GL_UNSIGNED_INT_24_8_MESA:
 	  case GL_UNSIGNED_INT_8_24_REV_MESA:
+#endif
 	    bytesPerElement = 4;
 	    elementsPerGroup = 1;
 	    break;
diff --git a/xorg-server/glx/single2.c b/xorg-server/glx/single2.c
index 3387af2a2..d9272a156 100644
--- a/xorg-server/glx/single2.c
+++ b/xorg-server/glx/single2.c
@@ -36,6 +36,10 @@
 #define NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include <string.h>
@@ -341,6 +345,9 @@ int DoGetString(__GLXclientState *cl, GLbyte *pc, GLboolean need_swap)
     string = (const char *) CALL_GetString( GET_DISPATCH(), (name) );
     client = cl->client;
 
+    if (string == NULL)
+      string = "";
+
     /*
     ** Restrict extensions to those that are supported by both the
     ** implementation and the connection.  That is, return the
diff --git a/xorg-server/glx/single2swap.c b/xorg-server/glx/single2swap.c
index 41a42bb0f..83408ae14 100644
--- a/xorg-server/glx/single2swap.c
+++ b/xorg-server/glx/single2swap.c
@@ -36,6 +36,10 @@
 #define NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include "glxserver.h"
diff --git a/xorg-server/glx/singlepix.c b/xorg-server/glx/singlepix.c
index d6b96defc..bac9a08be 100644
--- a/xorg-server/glx/singlepix.c
+++ b/xorg-server/glx/singlepix.c
@@ -36,6 +36,10 @@
 #define NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include "glxserver.h"
diff --git a/xorg-server/glx/singlepixswap.c b/xorg-server/glx/singlepixswap.c
index 032b42765..3a19dd51c 100644
--- a/xorg-server/glx/singlepixswap.c
+++ b/xorg-server/glx/singlepixswap.c
@@ -36,6 +36,10 @@
 #define NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include "glxserver.h"
diff --git a/xorg-server/glx/singlesize.c b/xorg-server/glx/singlesize.c
index b5a74f30d..124c32a4e 100644
--- a/xorg-server/glx/singlesize.c
+++ b/xorg-server/glx/singlesize.c
@@ -35,6 +35,10 @@
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include <GL/gl.h>
diff --git a/xorg-server/glx/swap_interval.c b/xorg-server/glx/swap_interval.c
index 24abd69fa..a136c950f 100644
--- a/xorg-server/glx/swap_interval.c
+++ b/xorg-server/glx/swap_interval.c
@@ -25,6 +25,10 @@
 #define NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include "glxserver.h"
@@ -54,7 +58,7 @@ int DoSwapInterval(__GLXclientState *cl, GLbyte *pc, int do_swap)
 
     cx = __glXLookupContextByTag(cl, tag);
 
-    LogMessage(X_ERROR, "%s: cx = %p, GLX screen = %p\n", __func__,
+    LogMessage(X_ERROR, "%s: cx = %p, GLX screen = %p\n", __FUNCTION__ ,
 	       cx, (cx == NULL) ? NULL : cx->pGlxScreen);
     if ((cx == NULL) || (cx->pGlxScreen == NULL)) {
 	client->errorValue = tag;
diff --git a/xorg-server/glx/xfont.c b/xorg-server/glx/xfont.c
index 9629cf147..2d1993f90 100644
--- a/xorg-server/glx/xfont.c
+++ b/xorg-server/glx/xfont.c
@@ -36,6 +36,10 @@
 #define NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include "glxserver.h"