13 files changed, 87 insertions, 50 deletions

diff --git a/mesalib/src/mesa/drivers/dri/common/drisw_util.c b/mesalib/src/mesa/drivers/dri/common/drisw_util.c
index d69274854..a5bdf8988 100644
--- a/mesalib/src/mesa/drivers/dri/common/drisw_util.c
+++ b/mesalib/src/mesa/drivers/dri/common/drisw_util.c
@@ -109,6 +109,7 @@ driCreateContextAttribs(__DRIscreen *screen, int api,
     unsigned major_version = 1;
     unsigned minor_version = 0;
     uint32_t flags = 0;
+    unsigned i;
 
     /* Either num_attribs is zero and attribs is NULL, or num_attribs is not
      * zero and attribs is not NULL.
@@ -130,7 +131,7 @@ driCreateContextAttribs(__DRIscreen *screen, int api,
             return NULL;
     }
 
-    for (unsigned i = 0; i < num_attribs; i++) {
+    for (i = 0; i < num_attribs; i++) {
 	switch (attribs[i * 2]) {
 	case __DRI_CTX_ATTRIB_MAJOR_VERSION:
 	    major_version = attribs[i * 2 + 1];
diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast.c b/mesalib/src/mesa/drivers/dri/swrast/swrast.c
index 5ce1eb029..dbd339bd8 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/formats.h"
@@ -178,7 +183,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;
     }
@@ -189,7 +194,7 @@ swrastFillInModes(__DRIscreen *psp,
 			       back_buffer_factor, msaa_samples_array, 1,
 			       GL_TRUE);
     if (configs == NULL) {
-	fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __func__,
+	fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __FUNCTION__,
 		__LINE__);
 	return NULL;
     }
@@ -894,15 +899,15 @@ dri_unbind_context(__DRIcontext * cPriv)
 
 
 const struct __DriverAPIRec driDriverAPI = {
-    .InitScreen = dri_init_screen,
-    .DestroyScreen = dri_destroy_screen,
-    .CreateContext = dri_create_context,
-    .DestroyContext = dri_destroy_context,
-    .CreateBuffer = dri_create_buffer,
-    .DestroyBuffer = dri_destroy_buffer,
-    .SwapBuffers = dri_swap_buffers,
-    .MakeCurrent = dri_make_current,
-    .UnbindContext = dri_unbind_context,
+    /*.InitScreen = */dri_init_screen,
+    /*.DestroyScreen = */dri_destroy_screen,
+    /*.CreateContext = */dri_create_context,
+    /*.DestroyContext = */dri_destroy_context,
+    /*.CreateBuffer = */dri_create_buffer,
+    /*.DestroyBuffer = */dri_destroy_buffer,
+    /*.SwapBuffers = */dri_swap_buffers,
+    /*.MakeCurrent = */dri_make_current,
+    /*.UnbindContext = */dri_unbind_context,
 };
 
 /* This is the table of extensions that the loader will dlsym() for. */
diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h b/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h
index b25de931a..36ab02053 100644
--- a/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h
+++ b/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h
@@ -33,6 +33,13 @@
 #include "dri_util.h"
 #include "swrast/s_context.h"
 
+#ifdef _MSC_VER
+#ifdef PUBLIC
+#undef PUBLIC
+#endif
+#define PUBLIC __declspec(dllexport)
+#endif
+
 
 /**
  * Debugging
diff --git a/mesalib/src/mesa/main/.gitignore b/mesalib/src/mesa/main/.gitignore
index b26be227f..8b94c55af 100644
--- a/mesalib/src/mesa/main/.gitignore
+++ b/mesalib/src/mesa/main/.gitignore
@@ -1,10 +1,11 @@
-api_exec_es1.c
-dispatch.h
-enums.c
-get_es1.c
-get_es2.c
-git_sha1.h
-git_sha1.h.tmp
-api_exec_es1_dispatch.h
-api_exec_es1_remap_helper.h
-remap_helper.h
+api_exec_es1.c

+dispatch.h

+enums.c

+get_es1.c

+get_es2.c

+git_sha1.h

+git_sha1.h.tmp

+api_exec_es1_dispatch.h

+api_exec_es1_remap_helper.h

+remap_helper.h

+glapitable.h

diff --git a/mesalib/src/mesa/main/bufferobj.c b/mesalib/src/mesa/main/bufferobj.c
index 0fc27e4ba..9c1e0bf52 100644
--- a/mesalib/src/mesa/main/bufferobj.c
+++ b/mesalib/src/mesa/main/bufferobj.c
@@ -238,7 +238,7 @@ buffer_object_subdata_range_good( struct gl_context * ctx, GLenum target,
  * 
  * Default callback for the \c dd_function_table::NewBufferObject() hook.
  */
-static struct gl_buffer_object *
+struct gl_buffer_object *
 _mesa_new_buffer_object( struct gl_context *ctx, GLuint name, GLenum target )
 {
    struct gl_buffer_object *obj;
@@ -256,7 +256,7 @@ _mesa_new_buffer_object( struct gl_context *ctx, GLuint name, GLenum target )
  * 
  * Default callback for the \c dd_function_table::DeleteBuffer() hook.
  */
-static void
+void
 _mesa_delete_buffer_object(struct gl_context *ctx,
                            struct gl_buffer_object *bufObj)
 {
@@ -407,7 +407,7 @@ _mesa_total_buffer_object_memory(struct gl_context *ctx)
  * \return GL_TRUE for success, GL_FALSE for failure
  * \sa glBufferDataARB, dd_function_table::BufferData.
  */
-static GLboolean
+GLboolean
 _mesa_buffer_data( struct gl_context *ctx, GLenum target, GLsizeiptrARB size,
 		   const GLvoid * data, GLenum usage,
 		   struct gl_buffer_object * bufObj )
@@ -451,7 +451,7 @@ _mesa_buffer_data( struct gl_context *ctx, GLenum target, GLsizeiptrARB size,
  *
  * \sa glBufferSubDataARB, dd_function_table::BufferSubData.
  */
-static void
+void
 _mesa_buffer_subdata( struct gl_context *ctx, GLintptrARB offset,
 		      GLsizeiptrARB size, const GLvoid * data,
 		      struct gl_buffer_object * bufObj )
@@ -484,7 +484,7 @@ _mesa_buffer_subdata( struct gl_context *ctx, GLintptrARB offset,
  *
  * \sa glBufferGetSubDataARB, dd_function_table::GetBufferSubData.
  */
-static void
+void
 _mesa_buffer_get_subdata( struct gl_context *ctx, GLintptrARB offset,
 			  GLsizeiptrARB size, GLvoid * data,
 			  struct gl_buffer_object * bufObj )
@@ -541,7 +541,7 @@ _mesa_buffer_flush_mapped_range( struct gl_context *ctx,
  *
  * \sa glUnmapBufferARB, dd_function_table::UnmapBuffer
  */
-static GLboolean
+GLboolean
 _mesa_buffer_unmap( struct gl_context *ctx, struct gl_buffer_object *bufObj )
 {
    (void) ctx;
diff --git a/mesalib/src/mesa/main/queryobj.c b/mesalib/src/mesa/main/queryobj.c
index 18792cf6c..42c77bdb8 100644
--- a/mesalib/src/mesa/main/queryobj.c
+++ b/mesalib/src/mesa/main/queryobj.c
@@ -41,7 +41,7 @@
  * \param id - the new object's ID
  * \return pointer to new query_object object or NULL if out of memory.
  */
-static struct gl_query_object *
+struct gl_query_object *
 _mesa_new_query_object(struct gl_context *ctx, GLuint id)
 {
    struct gl_query_object *q = MALLOC_STRUCT(gl_query_object);
@@ -60,7 +60,7 @@ _mesa_new_query_object(struct gl_context *ctx, GLuint id)
  * Begin a query.  Software driver fallback.
  * Called via ctx->Driver.BeginQuery().
  */
-static void
+void
 _mesa_begin_query(struct gl_context *ctx, struct gl_query_object *q)
 {
    /* no-op */
@@ -71,7 +71,7 @@ _mesa_begin_query(struct gl_context *ctx, struct gl_query_object *q)
  * End a query.  Software driver fallback.
  * Called via ctx->Driver.EndQuery().
  */
-static void
+void
 _mesa_end_query(struct gl_context *ctx, struct gl_query_object *q)
 {
    q->Ready = GL_TRUE;
@@ -82,7 +82,7 @@ _mesa_end_query(struct gl_context *ctx, struct gl_query_object *q)
  * Wait for query to complete.  Software driver fallback.
  * Called via ctx->Driver.WaitQuery().
  */
-static void
+void
 _mesa_wait_query(struct gl_context *ctx, struct gl_query_object *q)
 {
    /* For software drivers, _mesa_end_query() should have completed the query.
@@ -110,7 +110,7 @@ _mesa_check_query(struct gl_context *ctx, struct gl_query_object *q)
  * Delete a query object.  Called via ctx->Driver.DeleteQuery().
  * Not removed from hash table here.
  */
-static void
+void
 _mesa_delete_query(struct gl_context *ctx, struct gl_query_object *q)
 {
    free(q);
diff --git a/mesalib/src/mesa/main/syncobj.c b/mesalib/src/mesa/main/syncobj.c
index 1d178950c..8927f46b0 100644
--- a/mesalib/src/mesa/main/syncobj.c
+++ b/mesalib/src/mesa/main/syncobj.c
@@ -124,7 +124,7 @@ _mesa_wait_sync(struct gl_context *ctx, struct gl_sync_object *syncObj,
 }
 
 
-void
+void GLAPIENTRY
 _mesa_init_sync_object_functions(struct dd_function_table *driver)
 {
    driver->NewSyncObject = _mesa_new_sync_object;
@@ -139,7 +139,7 @@ _mesa_init_sync_object_functions(struct dd_function_table *driver)
 }
 
 
-void
+void GLAPIENTRY
 _mesa_init_sync_dispatch(struct _glapi_table *disp)
 {
    SET_IsSync(disp, _mesa_IsSync);
@@ -155,7 +155,7 @@ _mesa_init_sync_dispatch(struct _glapi_table *disp)
 /**
  * Allocate/init the context state related to sync objects.
  */
-void
+void GLAPIENTRY
 _mesa_init_sync(struct gl_context *ctx)
 {
    (void) ctx;
@@ -165,7 +165,7 @@ _mesa_init_sync(struct gl_context *ctx)
 /**
  * Free the context state related to sync objects.
  */
-void
+void GLAPIENTRY
 _mesa_free_sync_data(struct gl_context *ctx)
 {
    (void) ctx;
@@ -181,7 +181,7 @@ _mesa_validate_sync(struct gl_sync_object *syncObj)
 }
 
 
-void
+void GLAPIENTRY
 _mesa_ref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj)
 {
    _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
@@ -190,7 +190,7 @@ _mesa_ref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj)
 }
 
 
-void
+void GLAPIENTRY
 _mesa_unref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj)
 {
    _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
diff --git a/mesalib/src/mesa/main/syncobj.h b/mesalib/src/mesa/main/syncobj.h
index 40a1049ba..b0e09a605 100644
--- a/mesalib/src/mesa/main/syncobj.h
+++ b/mesalib/src/mesa/main/syncobj.h
@@ -39,22 +39,22 @@ struct dd_function_table;
 struct gl_context;
 struct gl_sync_object;
 
-extern void
+extern void GLAPIENTRY
 _mesa_init_sync_object_functions(struct dd_function_table *driver);
 
-extern void
+extern void GLAPIENTRY
 _mesa_init_sync_dispatch(struct _glapi_table *disp);
 
-extern void
+extern void GLAPIENTRY
 _mesa_init_sync(struct gl_context *);
 
-extern void
+extern void GLAPIENTRY
 _mesa_free_sync_data(struct gl_context *);
 
-extern void
+extern void GLAPIENTRY
 _mesa_ref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj);
 
-extern void
+extern void GLAPIENTRY
 _mesa_unref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj);
 
 extern GLboolean GLAPIENTRY
diff --git a/mesalib/src/mesa/main/texcompress_s3tc.c b/mesalib/src/mesa/main/texcompress_s3tc.c
index 6476f118e..d4288a6f8 100644
--- a/mesalib/src/mesa/main/texcompress_s3tc.c
+++ b/mesalib/src/mesa/main/texcompress_s3tc.c
@@ -48,7 +48,11 @@
 
 
 #if defined(_WIN32) || defined(WIN32)
+#ifdef _DEBUG
+#define DXTN_LIBNAME "dxtn_dbg.dll"
+#else
 #define DXTN_LIBNAME "dxtn.dll"
+#endif
 #define RTLD_LAZY 0
 #define RTLD_GLOBAL 0
 #elif defined(__DJGPP__)
diff --git a/mesalib/src/mesa/main/version.c b/mesalib/src/mesa/main/version.c
index 55638a807..7ee662714 100644
--- a/mesalib/src/mesa/main/version.c
+++ b/mesalib/src/mesa/main/version.c
@@ -25,7 +25,7 @@
 #include "imports.h"
 #include "mtypes.h"
 #include "version.h"
-#include "git_sha1.h"
+/*#include "git_sha1.h"*/
 
 /**
  * Override the context's GL version if the environment variable
diff --git a/mesalib/src/mesa/program/.gitignore b/mesalib/src/mesa/program/.gitignore
index 4c20872e1..2f1601fcc 100644
--- a/mesalib/src/mesa/program/.gitignore
+++ b/mesalib/src/mesa/program/.gitignore
@@ -1,4 +1,4 @@
-program_parse.output
-lex.yy.c
-program_parse.tab.c
-program_parse.tab.h
+lex.yy.c

+program_parse.output

+program_parse.tab.c

+program_parse.tab.h
\ No newline at end of file
diff --git a/mesalib/src/mesa/program/doflexbison.bat b/mesalib/src/mesa/program/doflexbison.bat
new file mode 100644
index 000000000..b39b53cf8
--- /dev/null
+++ b/mesalib/src/mesa/program/doflexbison.bat
@@ -0,0 +1,18 @@
+@echo off

+setlocal

+

+cd "%~dp0"

+

+set M4=..\..\..\..\tools\mhmake\m4.exe

+set BISON_PKGDATADIR=../../../../tools/mhmake/src/bisondata

+

+set path=..\..\..\..\tools\mhmake;%path%

+

+..\..\..\..\tools\mhmake\bison.exe -v -d -p "_mesa_program_" --output=program_parse.tab.c program_parse.y

+

+copy "..\..\..\..\tools\mhmake\flex++.exe" flex.exe

+flex.exe --never-interactive --outfile=lex.yy.c program_lexer.l

+del flex.exe

+

+endlocal

+

diff --git a/mesalib/src/mesa/program/hash_table.h b/mesalib/src/mesa/program/hash_table.h
index e95fc4982..b814497a6 100644
--- a/mesalib/src/mesa/program/hash_table.h
+++ b/mesalib/src/mesa/program/hash_table.h
@@ -37,6 +37,7 @@
 #include <stdint.h>
 #include <limits.h>
 #include <assert.h>
+#include <unistd.h>
 
 struct string_to_uint_map;