aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/drivers
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-10-09 16:41:40 +0000
committermarha <marha@users.sourceforge.net>2009-10-09 16:41:40 +0000
commitd6a7362183b858e5a9677b763b348fb13b9eac63 (patch)
tree6b93f45da934b0946bd2cb8f031139df3a99a479 /mesalib/src/mesa/drivers
parent382cdac4921c29f51d628b8e051c35365cd0940f (diff)
downloadvcxsrv-d6a7362183b858e5a9677b763b348fb13b9eac63.tar.gz
vcxsrv-d6a7362183b858e5a9677b763b348fb13b9eac63.tar.bz2
vcxsrv-d6a7362183b858e5a9677b763b348fb13b9eac63.zip
Opengl is working now.
Diffstat (limited to 'mesalib/src/mesa/drivers')
-rw-r--r--mesalib/src/mesa/drivers/dri/swrast/swrast.c9
-rw-r--r--mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h7
2 files changed, 14 insertions, 2 deletions
diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast.c b/mesalib/src/mesa/drivers/dri/swrast/swrast.c
index a858af30c..cfc3f2f0b 100644
--- a/mesalib/src/mesa/drivers/dri/swrast/swrast.c
+++ b/mesalib/src/mesa/drivers/dri/swrast/swrast.c
@@ -31,6 +31,11 @@
* The back-buffer is allocated by the driver and is private.
*/
+#ifdef _MSC_VER
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#endif
+
#include "main/context.h"
#include "main/extensions.h"
#include "main/framebuffer.h"
@@ -189,7 +194,7 @@ swrastFillInModes(__DRIscreen *psp,
fb_type = GL_UNSIGNED_INT_8_8_8_8_REV;
break;
default:
- fprintf(stderr, "[%s:%u] bad depth %d\n", __func__, __LINE__,
+ fprintf(stderr, "[%s:%u] bad depth %d\n", __FUNCTION__, __LINE__,
pixel_bits);
return NULL;
}
@@ -199,7 +204,7 @@ swrastFillInModes(__DRIscreen *psp,
depth_buffer_factor, back_buffer_modes,
back_buffer_factor, msaa_samples_array, 1);
if (configs == NULL) {
- fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __func__,
+ fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __FUNCTION__,
__LINE__);
return NULL;
}
diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h b/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h
index 1a5fb31d5..54319b20c 100644
--- a/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h
+++ b/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h
@@ -35,6 +35,13 @@
#include <GL/internal/dri_interface.h>
#include "main/mtypes.h"
+#ifdef _MSC_VER
+#ifdef PUBLIC
+#undef PUBLIC
+#endif
+#define PUBLIC __declspec(dllexport)
+#endif
+
/**
* Debugging