49 files changed, 4878 insertions, 477 deletions

diff --git a/mesalib/include/GL/internal/dri_interface.h b/mesalib/include/GL/internal/dri_interface.h
index 42d6968ce..68212d8df 100644
--- a/mesalib/include/GL/internal/dri_interface.h
+++ b/mesalib/include/GL/internal/dri_interface.h
@@ -41,7 +41,7 @@
 #define DRI_INTERFACE_H
 
 /* For archs with no drm.h */
-#if defined(__APPLE__) || defined(__CYGWIN__) || defined(__GNU__)
+#if defined(__APPLE__) || defined(__CYGWIN__) || defined(__GNU__) || defined(_MSC_VER)
 #ifndef __NOT_HAVE_DRM_H
 #define __NOT_HAVE_DRM_H
 #endif
@@ -329,6 +329,8 @@ struct __DRIgetDrawableInfoExtensionRec {
 	void *loaderPrivate);
 };
 
+typedef int int32_t;
+
 /**
  * Callback to get system time for media stream counter extensions.
  */
diff --git a/mesalib/include/getopt.h b/mesalib/include/getopt.h
new file mode 100644
index 000000000..695f89061
--- /dev/null
+++ b/mesalib/include/getopt.h
@@ -0,0 +1,128 @@
+/* Declarations for getopt.
+   Copyright (C) 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+#ifndef _GETOPT_H
+#define _GETOPT_H 1
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+/* For communication from `getopt' to the caller.
+   When `getopt' finds an option that takes an argument,
+   the argument value is returned here.
+   Also, when `ordering' is RETURN_IN_ORDER,
+   each non-option ARGV-element is returned here.  */
+
+extern char *optarg;
+
+/* Index in ARGV of the next element to be scanned.
+   This is used for communication to and from the caller
+   and for communication between successive calls to `getopt'.
+
+   On entry to `getopt', zero means this is the first call; initialize.
+
+   When `getopt' returns EOF, this is the index of the first of the
+   non-option elements that the caller should itself scan.
+
+   Otherwise, `optind' communicates from one call to the next
+   how much of ARGV has been scanned so far.  */
+
+extern int optind;
+
+/* Callers store zero here to inhibit the error message `getopt' prints
+   for unrecognized options.  */
+
+extern int opterr;
+
+  /* Set to an option character which was unrecognized.  */
+  
+  extern int optopt;
+  
+/* Describe the long-named options requested by the application.
+   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
+   of `struct option' terminated by an element containing a name which is
+   zero.
+
+   The field `has_arg' is:
+   no_argument		(or 0) if the option does not take an argument,
+   required_argument	(or 1) if the option requires an argument,
+   optional_argument 	(or 2) if the option takes an optional argument.
+
+   If the field `flag' is not NULL, it points to a variable that is set
+   to the value given in the field `val' when the option is found, but
+   left unchanged if the option is not found.
+
+   To have a long-named option do something other than set an `int' to
+   a compiled-in constant, such as set a value from `optarg', set the
+   option's `flag' field to zero and its `val' field to a nonzero
+   value (the equivalent single-letter option character, if there is
+   one).  For long options that have a zero `flag' field, `getopt'
+   returns the contents of the `val' field.  */
+
+struct option
+{
+#if	__STDC__
+  const char *name;
+#else
+  char *name;
+#endif
+  /* has_arg can't be an enum because some compilers complain about
+     type mismatches in all the code that assumes it is an int.  */
+  int has_arg;
+  int *flag;
+  int val;
+};
+
+/* Names for the values of the `has_arg' field of `struct option'.  */
+
+#define       no_argument     0
+#define required_argument     1
+#define optional_argument     2
+
+#if __STDC__
+#if defined(__GNU_LIBRARY__)
+/* Many other libraries have conflicting prototypes for getopt, with
+   differences in the consts, in stdlib.h.  To avoid compilation
+   errors, only prototype getopt for the GNU C library.  */
+extern int getopt (int argc, char *const *argv, const char *shortopts);
+#else /* not __GNU_LIBRARY__ */
+extern int getopt ();
+#endif /* not __GNU_LIBRARY__ */
+extern int getopt_long (int argc, char *const *argv, const char *shortopts,
+		        const struct option *longopts, int *longind);
+extern int getopt_long_only (int argc, char *const *argv,
+			     const char *shortopts,
+		             const struct option *longopts, int *longind);
+
+/* Internal only.  Users should not call this directly.  */
+extern int _getopt_internal (int argc, char *const *argv,
+			     const char *shortopts,
+		             const struct option *longopts, int *longind,
+			     int long_only);
+#else /* not __STDC__ */
+extern int getopt ();
+extern int getopt_long ();
+extern int getopt_long_only ();
+
+extern int _getopt_internal ();
+#endif /* not __STDC__ */
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif /* _GETOPT_H */
diff --git a/mesalib/src/glsl/ast.h b/mesalib/src/glsl/ast.h
index b2e19169e..23b3b78b2 100644
--- a/mesalib/src/glsl/ast.h
+++ b/mesalib/src/glsl/ast.h
@@ -63,6 +63,10 @@ public:
 
    /* If the user *does* call delete, that's OK, we will just
     * talloc_free in that case. */
+   static void operator delete(void *table, void *ctx)
+   {
+      talloc_free(table);
+   }
    static void operator delete(void *table)
    {
       talloc_free(table);
diff --git a/mesalib/src/glsl/getopt.cpp b/mesalib/src/glsl/getopt.cpp
new file mode 100644
index 000000000..ea5dd3927
--- /dev/null
+++ b/mesalib/src/glsl/getopt.cpp
@@ -0,0 +1,552 @@
+/*      $OpenBSD: getopt_long.c,v 1.20 2005/10/25 15:49:37 jmc Exp $    */
+/*      $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $      */
+// Adapted for Box Backup by Chris Wilson <chris+boxbackup@qwirx.com>
+
+/*
+ * Copyright (c) 2002 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F39502-99-1-0512.
+ */
+/*-
+ * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Dieter Baron and Thomas Klausner.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// #include "Box.h"
+
+#include <errno.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#define __STDC__ 1
+
+#include "getopt.h"
+
+#if defined _MSC_VER || defined __MINGW32__
+#define REPLACE_GETOPT          /* use this getopt as the system getopt(3) */
+
+#ifdef REPLACE_GETOPT
+int     opterr = 1;             /* if error message should be printed */
+int     optind = 1;             /* index into parent argv vector */
+int     optopt = '?';           /* character checked for validity */
+int     optreset;               /* reset getopt */
+char    *optarg;                /* argument associated with option */
+#endif
+
+#define PRINT_ERROR     ((opterr) && (*options != ':'))
+
+#define FLAG_PERMUTE    0x01    /* permute non-options to the end of argv */
+#define FLAG_ALLARGS    0x02    /* treat non-options as args to option "-1" */
+#define FLAG_LONGONLY   0x04    /* operate as getopt_long_only */
+
+/* return values */
+#define BADCH           (int)'?'
+#define BADARG          ((*options == ':') ? (int)':' : (int)'?')
+#define INORDER         (int)1
+
+#define EMSG            ""
+
+static void warnx(const char* fmt, ...)
+{
+        va_list ap;
+        va_start(ap, fmt);
+        vfprintf(stderr, fmt, ap);
+        va_end(ap);
+	        fprintf(stderr, "\n");
+	}
+	
+	static int getopt_internal(int, char * const *, const char *,
+	                           const struct option *, int *, int);
+	static int parse_long_options(char * const *, const char *,
+	                              const struct option *, int *, int);
+	static int gcd(int, int);
+	static void permute_args(int, int, int, char * const *);
+	
+	static char *place = EMSG; /* option letter processing */
+	
+	/* XXX: set optreset to 1 rather than these two */
+	static int nonopt_start = -1; /* first non option argument (for permute) */
+	static int nonopt_end = -1;   /* first option after non options (for permute) */
+	
+	/* Error messages */
+	static const char recargchar[] = "option requires an argument -- %c";
+	static const char recargstring[] = "option requires an argument -- %s";
+	static const char ambig[] = "ambiguous option -- %.*s";
+	static const char noarg[] = "option doesn't take an argument -- %.*s";
+	static const char illoptchar[] = "unknown option -- %c";
+	static const char illoptstring[] = "unknown option -- %s";
+	
+	/*
+	 * Compute the greatest common divisor of a and b.
+	 */
+	static int
+	gcd(int a, int b)
+	{
+	        int c;
+	
+	        c = a % b;
+	        while (c != 0) {
+	                a = b;
+	                b = c;
+	                c = a % b;
+	        }
+	
+	        return (b);
+	}
+	
+	/*
+	 * Exchange the block from nonopt_start to nonopt_end with the block
+	 * from nonopt_end to opt_end (keeping the same order of arguments
+	 * in each block).
+	 */
+	static void
+	permute_args(int panonopt_start, int panonopt_end, int opt_end,
+	        char * const *nargv)
+	{
+	        int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos;
+	        char *swap;
+	
+	        /*
+	         * compute lengths of blocks and number and size of cycles
+	         */
+	        nnonopts = panonopt_end - panonopt_start;
+	        nopts = opt_end - panonopt_end;
+	        ncycle = gcd(nnonopts, nopts);
+	        cyclelen = (opt_end - panonopt_start) / ncycle;
+	
+	        for (i = 0; i < ncycle; i++) {
+	                cstart = panonopt_end+i;
+	                pos = cstart;
+	                for (j = 0; j < cyclelen; j++) {
+	                        if (pos >= panonopt_end)
+	                                pos -= nnonopts;
+	                        else
+	                                pos += nopts;
+	                        swap = nargv[pos];
+	                        /* LINTED const cast */
+	                        ((char **) nargv)[pos] = nargv[cstart];
+	                        /* LINTED const cast */
+	                        ((char **)nargv)[cstart] = swap;
+	                }
+	        }
+	}
+	
+	/*
+	 * parse_long_options --
+	 *      Parse long options in argc/argv argument vector.
+	 * Returns -1 if short_too is set and the option does not match long_options.
+	 */
+	static int
+	parse_long_options(char * const *nargv, const char *options,
+	        const struct option *long_options, int *idx, int short_too)
+	{
+	        char *current_argv, *has_equal;
+	        size_t current_argv_len;
+	        int i, match;
+	
+	        current_argv = place;
+	        match = -1;
+	
+	        optind++;
+	
+	        if ((has_equal = strchr(current_argv, '=')) != NULL) {
+	                /* argument found (--option=arg) */
+	                current_argv_len = has_equal - current_argv;
+	                has_equal++;
+	        } else
+	                current_argv_len = strlen(current_argv);
+	
+	        for (i = 0; long_options[i].name; i++) {
+	                /* find matching long option */
+	                if (strncmp(current_argv, long_options[i].name,
+	                    current_argv_len))
+	                        continue;
+	
+	                if (strlen(long_options[i].name) == current_argv_len) {
+	                        /* exact match */
+	                        match = i;
+	                        break;
+	                }
+	                /*
+	                 * If this is a known short option, don't allow
+	                 * a partial match of a single character.
+	                 */
+	                if (short_too && current_argv_len == 1)
+	                        continue;
+	
+	                if (match == -1)        /* partial match */
+	                        match = i;
+	                else {
+	                        /* ambiguous abbreviation */
+	                        if (PRINT_ERROR)
+	                                warnx(ambig, (int)current_argv_len,
+	                                     current_argv);
+	                        optopt = 0;
+	                        return (BADCH);
+	                }
+	        }
+	        if (match != -1) {              /* option found */
+	                if (long_options[match].has_arg == no_argument
+	                    && has_equal) {
+	                        if (PRINT_ERROR)
+	                                warnx(noarg, (int)current_argv_len,
+	                                     current_argv);
+	                        /*
+	                         * XXX: GNU sets optopt to val regardless of flag
+	                         */
+	                        if (long_options[match].flag == NULL)
+	                                optopt = long_options[match].val;
+	                        else
+	                                optopt = 0;
+	                        return (BADARG);
+	                }
+	                if (long_options[match].has_arg == required_argument ||
+	                    long_options[match].has_arg == optional_argument) {
+	                        if (has_equal)
+	                                optarg = has_equal;
+	                        else if (long_options[match].has_arg ==
+	                            required_argument) {
+	                                /*
+	                                 * optional argument doesn't use next nargv
+	                                 */
+	                                optarg = nargv[optind++];
+	                        }
+	                }
+	                if ((long_options[match].has_arg == required_argument)
+	                    && (optarg == NULL)) {
+	                        /*
+	                         * Missing argument; leading ':' indicates no error
+	                         * should be generated.
+	                         */
+	                        if (PRINT_ERROR)
+	                                warnx(recargstring,
+	                                    current_argv);
+	                        /*
+	                         * XXX: GNU sets optopt to val regardless of flag
+	                         */
+	                        if (long_options[match].flag == NULL)
+	                                optopt = long_options[match].val;
+	                        else
+	                                optopt = 0;
+	                        --optind;
+	                        return (BADARG);
+	                }
+	        } else {                        /* unknown option */
+	                if (short_too) {
+	                        --optind;
+	                        return (-1);
+	                }
+	                if (PRINT_ERROR)
+	                        warnx(illoptstring, current_argv);
+	                optopt = 0;
+	                return (BADCH);
+	        }
+	        if (idx)
+	                *idx = match;
+	        if (long_options[match].flag) {
+	                *long_options[match].flag = long_options[match].val;
+	                return (0);
+	        } else
+	                return (long_options[match].val);
+	}
+	
+	/*
+	 * getopt_internal --
+	 *      Parse argc/argv argument vector.  Called by user level routines.
+	 */
+	static int
+	getopt_internal(int nargc, char * const *nargv, const char *options,
+	        const struct option *long_options, int *idx, int flags)
+	{
+	        const char * oli; /* option letter list index */
+	        int optchar, short_too;
+	        static int posixly_correct = -1;
+	
+	        if (options == NULL)
+	                return (-1);
+	
+	        /*
+	         * Disable GNU extensions if POSIXLY_CORRECT is set or options
+	         * string begins with a '+'.
+	         */
+	        if (posixly_correct == -1)
+	                posixly_correct = (getenv("POSIXLY_CORRECT") != NULL);
+	        if (posixly_correct || *options == '+')
+	                flags &= ~FLAG_PERMUTE;
+	        else if (*options == '-')
+	                flags |= FLAG_ALLARGS;
+	        if (*options == '+' || *options == '-')
+	                options++;
+	
+	        /*
+	         * XXX Some GNU programs (like cvs) set optind to 0 instead of
+	         * XXX using optreset.  Work around this braindamage.
+	         */
+	        if (optind == 0)
+	                optind = optreset = 1;
+	
+	        optarg = NULL;
+	        if (optreset)
+	                nonopt_start = nonopt_end = -1;
+	start:
+	        if (optreset || !*place) {              /* update scanning pointer */
+	                optreset = 0;
+	                if (optind >= nargc) {          /* end of argument vector */
+	                        place = EMSG;
+	                        if (nonopt_end != -1) {
+	                                /* do permutation, if we have to */
+	                                permute_args(nonopt_start, nonopt_end,
+	                                    optind, nargv);
+	                                optind -= nonopt_end - nonopt_start;
+	                        }
+	                        else if (nonopt_start != -1) {
+	                                /*
+	                                 * If we skipped non-options, set optind
+	                                 * to the first of them.
+	                                 */
+	                                optind = nonopt_start;
+	                        }
+	                        nonopt_start = nonopt_end = -1;
+	                        return (-1);
+	                }
+	                if (*(place = nargv[optind]) != '-' ||
+	                    (place[1] == '\0' && strchr(options, '-') == NULL)) {
+	                        place = EMSG;           /* found non-option */
+	                        if (flags & FLAG_ALLARGS) {
+	                                /*
+	                                 * GNU extension:
+	                                 * return non-option as argument to option 1
+	                                 */
+	                                optarg = nargv[optind++];
+	                                return (INORDER);
+	                        }
+	                        if (!(flags & FLAG_PERMUTE)) {
+	                                /*
+	                                 * If no permutation wanted, stop parsing
+	                                 * at first non-option.
+	                                 */
+	                                return (-1);
+	                        }
+	                        /* do permutation */
+	                        if (nonopt_start == -1)
+	                                nonopt_start = optind;
+	                        else if (nonopt_end != -1) {
+	                                permute_args(nonopt_start, nonopt_end,
+	                                    optind, nargv);
+	                                nonopt_start = optind -
+	                                    (nonopt_end - nonopt_start);
+	                                nonopt_end = -1;
+	                        }
+	                        optind++;
+	                        /* process next argument */
+	                        goto start;
+	                }
+	                if (nonopt_start != -1 && nonopt_end == -1)
+	                        nonopt_end = optind;
+	
+	                /*
+	                 * If we have "-" do nothing, if "--" we are done.
+	                 */
+	                if (place[1] != '\0' && *++place == '-' && place[1] == '\0') {
+	                        optind++;
+	                        place = EMSG;
+	                        /*
+	                         * We found an option (--), so if we skipped
+	                         * non-options, we have to permute.
+	                         */
+	                        if (nonopt_end != -1) {
+	                                permute_args(nonopt_start, nonopt_end,
+	                                    optind, nargv);
+	                                optind -= nonopt_end - nonopt_start;
+	                        }
+	                        nonopt_start = nonopt_end = -1;
+	                        return (-1);
+	                }
+	        }
+	
+	        /*
+	         * Check long options if:
+	         *  1) we were passed some
+	         *  2) the arg is not just "-"
+	         *  3) either the arg starts with -- we are getopt_long_only()
+	         */
+	        if (long_options != NULL && place != nargv[optind] &&
+	            (*place == '-' || (flags & FLAG_LONGONLY))) {
+	                short_too = 0;
+	                if (*place == '-')
+	                        place++;                /* --foo long option */
+	                else if (*place != ':' && strchr(options, *place) != NULL)
+	                        short_too = 1;          /* could be short option too */
+	
+	                optchar = parse_long_options(nargv, options, long_options,
+	                    idx, short_too);
+	                if (optchar != -1) {
+	                        place = EMSG;
+	                        return (optchar);
+	                }
+	        }
+	
+	        if ((optchar = (int)*place++) == (int)':' ||
+	            optchar == (int)'-' && *place != '\0' ||
+	            (oli = strchr(options, optchar)) == NULL) {
+	                /*
+	                 * If the user specified "-" and  '-' isn't listed in
+	                 * options, return -1 (non-option) as per POSIX.
+	                 * Otherwise, it is an unknown option character (or ':').
+	                 */
+	                if (optchar == (int)'-' && *place == '\0')
+	                        return (-1);
+	                if (!*place)
+	                        ++optind;
+	                if (PRINT_ERROR)
+	                        warnx(illoptchar, optchar);
+	                optopt = optchar;
+	                return (BADCH);
+	        }
+	        if (long_options != NULL && optchar == 'W' && oli[1] == ';') {
+	                /* -W long-option */
+	                if (*place)                     /* no space */
+	                        /* NOTHING */;
+	                else if (++optind >= nargc) {   /* no arg */
+	                        place = EMSG;
+	                        if (PRINT_ERROR)
+	                                warnx(recargchar, optchar);
+	                        optopt = optchar;
+	                        return (BADARG);
+	                } else                          /* white space */
+	                        place = nargv[optind];
+	                optchar = parse_long_options(nargv, options, long_options,
+	                    idx, 0);
+	                place = EMSG;
+	                return (optchar);
+	        }
+	        if (*++oli != ':') {                    /* doesn't take argument */
+	                if (!*place)
+	                        ++optind;
+	        } else {                                /* takes (optional) argument */
+	                optarg = NULL;
+	                if (*place)                     /* no white space */
+	                        optarg = place;
+	                /* XXX: disable test for :: if PC? (GNU doesn't) */
+	                else if (oli[1] != ':') {       /* arg not optional */
+	                        if (++optind >= nargc) {        /* no arg */
+	                                place = EMSG;
+	                                if (PRINT_ERROR)
+	                                        warnx(recargchar, optchar);
+	                                optopt = optchar;
+	                                return (BADARG);
+	                        } else
+	                                optarg = nargv[optind];
+	                } else if (!(flags & FLAG_PERMUTE)) {
+	                        /*
+	                         * If permutation is disabled, we can accept an
+	                         * optional arg separated by whitespace so long
+	                         * as it does not start with a dash (-).
+	                         */
+	                        if (optind + 1 < nargc && *nargv[optind + 1] != '-')
+	                                optarg = nargv[++optind];
+	                }
+	                place = EMSG;
+	                ++optind;
+	        }
+	        /* dump back option letter */
+	        return (optchar);
+	}
+	
+	#ifdef REPLACE_GETOPT
+	/*
+	 * getopt --
+	 *      Parse argc/argv argument vector.
+	 *
+	 * [eventually this will replace the BSD getopt]
+	 */
+	int
+	getopt(int nargc, char * const *nargv, const char *options)
+	{
+	
+	        /*
+	         * We don't pass FLAG_PERMUTE to getopt_internal() since
+	         * the BSD getopt(3) (unlike GNU) has never done this.
+	         *
+	         * Furthermore, since many privileged programs call getopt()
+	         * before dropping privileges it makes sense to keep things
+	         * as simple (and bug-free) as possible.
+	         */
+	        return (getopt_internal(nargc, nargv, options, NULL, NULL, 0));
+	}
+	#endif /* REPLACE_GETOPT */
+	
+	/*
+	 * getopt_long --
+	 *      Parse argc/argv argument vector.
+	 */
+	int
+	getopt_long(int nargc, char * const *nargv, const char *options,
+	    const struct option *long_options, int *idx)
+	{
+	
+	        return (getopt_internal(nargc, nargv, options, long_options, idx,
+	            FLAG_PERMUTE));
+	}
+	
+	/*
+	 * getopt_long_only --
+	 *      Parse argc/argv argument vector.
+	 */
+	int
+	getopt_long_only(int nargc, char * const *nargv, const char *options,
+	    const struct option *long_options, int *idx)
+	{
+	
+	        return (getopt_internal(nargc, nargv, options, long_options, idx,
+	            FLAG_PERMUTE|FLAG_LONGONLY));
+	}
+	
+#endif // defined _MSC_VER || defined __MINGW32__
\ No newline at end of file
diff --git a/mesalib/src/glsl/glcpp/glcpp.c b/mesalib/src/glsl/glcpp/glcpp.c
index a9ddf8e31..016d7f97e 100644
--- a/mesalib/src/glsl/glcpp/glcpp.c
+++ b/mesalib/src/glsl/glcpp/glcpp.c
@@ -31,6 +31,14 @@
 #include "main/mtypes.h"

 #include "main/shaderobj.h"

 

+#ifdef _MSC_VER

+#include <io.h>

+#define STDIN_FILENO 0

+#define read _read

+#define open _open

+#define close _close

+#endif

+

 extern int yydebug;

 

 void

diff --git a/mesalib/src/glsl/glsl_parser_extras.h b/mesalib/src/glsl/glsl_parser_extras.h
index 92029e2e8..baba92bc6 100644
--- a/mesalib/src/glsl/glsl_parser_extras.h
+++ b/mesalib/src/glsl/glsl_parser_extras.h
@@ -58,6 +58,10 @@ struct _mesa_glsl_parse_state {
 
    /* If the user *does* call delete, that's OK, we will just
     * talloc_free in that case. */
+   static void operator delete(void *mem, void *ctx)
+   {
+      talloc_free(mem);
+   }
    static void operator delete(void *mem)
    {
       talloc_free(mem);
diff --git a/mesalib/src/glsl/glsl_symbol_table.cpp b/mesalib/src/glsl/glsl_symbol_table.cpp
index 6fcfe07b9..f8c6c38fa 100644
--- a/mesalib/src/glsl/glsl_symbol_table.cpp
+++ b/mesalib/src/glsl/glsl_symbol_table.cpp
@@ -36,6 +36,10 @@ public:
    }
 
    /* If the user *does* call delete, that's OK, we will just talloc_free. */
+   static void operator delete(void *entry, void *ctx)
+   {
+      talloc_free(entry);
+   }
    static void operator delete(void *entry)
    {
       talloc_free(entry);
diff --git a/mesalib/src/glsl/glsl_symbol_table.h b/mesalib/src/glsl/glsl_symbol_table.h
index f48e9406e..3890efd87 100644
--- a/mesalib/src/glsl/glsl_symbol_table.h
+++ b/mesalib/src/glsl/glsl_symbol_table.h
@@ -70,6 +70,11 @@ public:
    /* If the user *does* call delete, that's OK, we will just

     * talloc_free in that case. Here, C++ will have already called the

     * destructor so tell talloc not to do that again. */

+   static void operator delete(void *table, void *ctx)

+   {

+      talloc_set_destructor(table, NULL);

+      talloc_free(table);

+   }

    static void operator delete(void *table)

    {

       talloc_set_destructor(table, NULL);

diff --git a/mesalib/src/glsl/list.h b/mesalib/src/glsl/list.h
index 3197b03cf..9c39855ad 100644
--- a/mesalib/src/glsl/list.h
+++ b/mesalib/src/glsl/list.h
@@ -94,6 +94,10 @@ struct exec_node {
 
    /* If the user *does* call delete, that's OK, we will just
     * talloc_free in that case. */
+   static void operator delete(void *node, void *ctx)
+   {
+      talloc_free(node);
+   }
    static void operator delete(void *node)
    {
       talloc_free(node);
@@ -303,6 +307,10 @@ struct exec_list {
 
    /* If the user *does* call delete, that's OK, we will just
     * talloc_free in that case. */
+   static void operator delete(void *node, void *ctx)
+   {
+      talloc_free(node);
+   }
    static void operator delete(void *node)
    {
       talloc_free(node);
diff --git a/mesalib/src/glsl/main.cpp b/mesalib/src/glsl/main.cpp
index c445fb2b5..a51062456 100644
--- a/mesalib/src/glsl/main.cpp
+++ b/mesalib/src/glsl/main.cpp
@@ -22,7 +22,18 @@
  */

 #include <cstdlib>

 #include <cstdio>

+#include <io.h>

+

+#ifdef _MSC_VER

+#define __STDC__ 1

 #include <getopt.h>

+#define open _open

+#define read _read

+#define fstat _fstat

+#define stat _stat

+#define close _close

+#define O_RDONLY _O_RDONLY

+#endif

 

 #include "ast.h"

 #include "glsl_parser_extras.h"

diff --git a/mesalib/src/mapi/glapi/gen/gen.bat b/mesalib/src/mapi/glapi/gen/gen.bat
new file mode 100644
index 000000000..2b1826a81
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/gen.bat
@@ -0,0 +1,20 @@
+echo on
+glx_server_table.py -f gl_and_glX_API.xml > indirect_table.c
+glx_proto_size.py -m size_h --only-set -h _INDIRECT_SIZE_H_ > indirect_size.h
+glx_proto_size.py -m size_c --only-set > indirect_size.c
+glx_proto_size.py -m size_h --only-get -h _INDIRECT_SIZE_GET_H_ > indirect_size_get.h
+glx_proto_size.py -m size_c --only-get > indirect_size_get.c
+glx_proto_size.py -m reqsize_c > indirect_reqsize.c
+glx_proto_size.py -m reqsize_h --only-get -h _INDIRECT_SIZE_GET_H_ > indirect_reqsize.h
+glx_proto_recv.py -m dispatch_c > indirect_dispatch.c
+glx_proto_recv.py -m dispatch_c -s > indirect_dispatch_swap.c
+glx_proto_recv.py -m dispatch_h -f gl_and_glX_API.xml -s > indirect_dispatch.h
+gl_table.py > glapitable.h
+gl_table.py -m remap_table > dispatch.h
+rem gl_offsets.py > glapioffsets.h
+gl_apitemp.py > glapitemp.h
+gl_procs.py > glprocs.h
+
+glX_proto_send.py -m proto > indirect.c
+glX_proto_send.py -m init_h > indirect.h
+glX_proto_send.py -m init_c > indirect_init.c
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index 1f12c4234..b792c7815 100644
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -183,18 +183,18 @@
         <size name="Get" mode="get"/>

     </enum>

     <enum name="LIGHT_MODEL_LOCAL_VIEWER"      count="1"  value="0x0B51">

-        <size name="LightModelfv"/>

-        <size name="LightModeliv"/>

+        <size name="LightModelfv" mode="get"/>

+        <size name="LightModeliv" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="LIGHT_MODEL_TWO_SIDE"          count="1"  value="0x0B52">

-        <size name="LightModelfv"/>

-        <size name="LightModeliv"/>

+        <size name="LightModelfv" mode="get"/>

+        <size name="LightModeliv" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="LIGHT_MODEL_AMBIENT"           count="4"  value="0x0B53">

-        <size name="LightModelfv"/>

-        <size name="LightModeliv"/>

+        <size name="LightModelfv" mode="get"/>

+        <size name="LightModeliv" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="SHADE_MODEL"                   count="1"  value="0x0B54">

@@ -213,33 +213,33 @@
         <size name="Get" mode="get"/>

     </enum>

     <enum name="FOG_INDEX"                     count="1"  value="0x0B61">

-        <size name="Fogfv"/>

-        <size name="Fogiv"/>

+        <size name="Fogfv" mode="get"/>

+        <size name="Fogiv" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="FOG_DENSITY"                   count="1"  value="0x0B62">

-        <size name="Fogfv"/>

-        <size name="Fogiv"/>

+        <size name="Fogfv" mode="get"/>

+        <size name="Fogiv" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="FOG_START"                     count="1"  value="0x0B63">

-        <size name="Fogfv"/>

-        <size name="Fogiv"/>

+        <size name="Fogfv" mode="get"/>

+        <size name="Fogiv" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="FOG_END"                       count="1"  value="0x0B64">

-        <size name="Fogfv"/>

-        <size name="Fogiv"/>

+        <size name="Fogfv" mode="get"/>

+        <size name="Fogiv" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="FOG_MODE"                      count="1"  value="0x0B65">

-        <size name="Fogfv"/>

-        <size name="Fogiv"/>

+        <size name="Fogfv" mode="get"/>

+        <size name="Fogiv" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="FOG_COLOR"                     count="4"  value="0x0B66">

-        <size name="Fogfv"/>

-        <size name="Fogiv"/>

+        <size name="Fogfv" mode="get"/>

+        <size name="Fogiv" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="DEPTH_RANGE"                   count="2"  value="0x0B70">

@@ -531,8 +531,8 @@
         <size name="Get" mode="get"/>

     </enum>

     <enum name="ALPHA_SCALE"                   count="1"  value="0x0D1C">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

         <size name="Get" mode="get"/>

@@ -625,93 +625,93 @@
         <size name="Get" mode="get"/>

     </enum>

     <enum name="MAP1_COLOR_4"                  count="4"  value="0x0D90">

-        <size name="Map1d"/>

-        <size name="Map1f"/>

+        <size name="Map1d" mode="get"/>

+        <size name="Map1f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP1_INDEX"                    count="1"  value="0x0D91">

-        <size name="Map1d"/>

-        <size name="Map1f"/>

+        <size name="Map1d" mode="get"/>

+        <size name="Map1f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP1_NORMAL"                   count="3"  value="0x0D92">

-        <size name="Map1d"/>

-        <size name="Map1f"/>

+        <size name="Map1d" mode="get"/>

+        <size name="Map1f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP1_TEXTURE_COORD_1"          count="1"  value="0x0D93">

-        <size name="Map1d"/>

-        <size name="Map1f"/>

+        <size name="Map1d" mode="get"/>

+        <size name="Map1f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP1_TEXTURE_COORD_2"          count="2"  value="0x0D94">

-        <size name="Map1d"/>

-        <size name="Map1f"/>

+        <size name="Map1d" mode="get"/>

+        <size name="Map1f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP1_TEXTURE_COORD_3"          count="3"  value="0x0D95">

-        <size name="Map1d"/>

-        <size name="Map1f"/>

+        <size name="Map1d" mode="get"/>

+        <size name="Map1f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP1_TEXTURE_COORD_4"          count="4"  value="0x0D96">

-        <size name="Map1d"/>

-        <size name="Map1f"/>

+        <size name="Map1d" mode="get"/>

+        <size name="Map1f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP1_VERTEX_3"                 count="3"  value="0x0D97">

-        <size name="Map1d"/>

-        <size name="Map1f"/>

+        <size name="Map1d" mode="get"/>

+        <size name="Map1f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP1_VERTEX_4"                 count="4"  value="0x0D98">

-        <size name="Map1d"/>

-        <size name="Map1f"/>

+        <size name="Map1d" mode="get"/>

+        <size name="Map1f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP2_COLOR_4"                  count="4"  value="0x0DB0">

-        <size name="Map2d"/>

-        <size name="Map2f"/>

+        <size name="Map2d" mode="get"/>

+        <size name="Map2f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP2_INDEX"                    count="1"  value="0x0DB1">

-        <size name="Map2d"/>

-        <size name="Map2f"/>

+        <size name="Map2d" mode="get"/>

+        <size name="Map2f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP2_NORMAL"                   count="3"  value="0x0DB2">

-        <size name="Map2d"/>

-        <size name="Map2f"/>

+        <size name="Map2d" mode="get"/>

+        <size name="Map2f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP2_TEXTURE_COORD_1"          count="1"  value="0x0DB3">

-        <size name="Map2d"/>

-        <size name="Map2f"/>

+        <size name="Map2d" mode="get"/>

+        <size name="Map2f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP2_TEXTURE_COORD_2"          count="2"  value="0x0DB4">

-        <size name="Map2d"/>

-        <size name="Map2f"/>

+        <size name="Map2d" mode="get"/>

+        <size name="Map2f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP2_TEXTURE_COORD_3"          count="3"  value="0x0DB5">

-        <size name="Map2d"/>

-        <size name="Map2f"/>

+        <size name="Map2d" mode="get"/>

+        <size name="Map2f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP2_TEXTURE_COORD_4"          count="4"  value="0x0DB6">

-        <size name="Map2d"/>

-        <size name="Map2f"/>

+        <size name="Map2d" mode="get"/>

+        <size name="Map2f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP2_VERTEX_3"                 count="3"  value="0x0DB7">

-        <size name="Map2d"/>

-        <size name="Map2f"/>

+        <size name="Map2d" mode="get"/>

+        <size name="Map2f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP2_VERTEX_4"                 count="4"  value="0x0DB8">

-        <size name="Map2d"/>

-        <size name="Map2f"/>

+        <size name="Map2d" mode="get"/>

+        <size name="Map2f" mode="get"/>

         <size name="Get" count="1" mode="get"/>

     </enum>

     <enum name="MAP1_GRID_DOMAIN"              count="2"  value="0x0DD0">

@@ -754,8 +754,8 @@
         <size name="GetTexLevelParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_BORDER_COLOR"          count="4"  value="0x1004">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -763,111 +763,111 @@
     <enum name="FASTEST"                                  value="0x1101"/>

     <enum name="NICEST"                                   value="0x1102"/>

     <enum name="AMBIENT"                       count="4"  value="0x1200">

-        <size name="Materialfv"/>

-        <size name="Materialiv"/>

-        <size name="Lightfv"/>

-        <size name="Lightiv"/>

+        <size name="Materialfv" mode="get"/>

+        <size name="Materialiv" mode="get"/>

+        <size name="Lightfv" mode="get"/>

+        <size name="Lightiv" mode="get"/>

         <size name="GetMaterialfv" mode="get"/>

         <size name="GetMaterialiv" mode="get"/>

         <size name="GetLightfv" mode="get"/>

         <size name="GetLightiv" mode="get"/>

     </enum>

     <enum name="DIFFUSE"                       count="4"  value="0x1201">

-        <size name="Materialfv"/>

-        <size name="Materialiv"/>

-        <size name="Lightfv"/>

-        <size name="Lightiv"/>

+        <size name="Materialfv" mode="get"/>

+        <size name="Materialiv" mode="get"/>

+        <size name="Lightfv" mode="get"/>

+        <size name="Lightiv" mode="get"/>

         <size name="GetMaterialfv" mode="get"/>

         <size name="GetMaterialiv" mode="get"/>

         <size name="GetLightfv" mode="get"/>

         <size name="GetLightiv" mode="get"/>

     </enum>

     <enum name="SPECULAR"                      count="4"  value="0x1202">

-        <size name="Materialfv"/>

-        <size name="Materialiv"/>

-        <size name="Lightfv"/>

-        <size name="Lightiv"/>

+        <size name="Materialfv" mode="get"/>

+        <size name="Materialiv" mode="get"/>

+        <size name="Lightfv" mode="get"/>

+        <size name="Lightiv" mode="get"/>

         <size name="GetMaterialfv" mode="get"/>

         <size name="GetMaterialiv" mode="get"/>

         <size name="GetLightfv" mode="get"/>

         <size name="GetLightiv" mode="get"/>

     </enum>

     <enum name="POSITION"                      count="4"  value="0x1203">

-        <size name="Lightfv"/>

-        <size name="Lightiv"/>

+        <size name="Lightfv" mode="get"/>

+        <size name="Lightiv" mode="get"/>

         <size name="GetLightfv" mode="get"/>

         <size name="GetLightiv" mode="get"/>

     </enum>

     <enum name="SPOT_DIRECTION"                count="3"  value="0x1204">

-        <size name="Lightfv"/>

-        <size name="Lightiv"/>

+        <size name="Lightfv" mode="get"/>

+        <size name="Lightiv" mode="get"/>

         <size name="GetLightfv" mode="get"/>

         <size name="GetLightiv" mode="get"/>

     </enum>

     <enum name="SPOT_EXPONENT"                 count="1"  value="0x1205">

-        <size name="Lightfv"/>

-        <size name="Lightiv"/>

+        <size name="Lightfv" mode="get"/>

+        <size name="Lightiv" mode="get"/>

         <size name="GetLightfv" mode="get"/>

         <size name="GetLightiv" mode="get"/>

     </enum>

     <enum name="SPOT_CUTOFF"                   count="1"  value="0x1206">

-        <size name="Lightfv"/>

-        <size name="Lightiv"/>

+        <size name="Lightfv" mode="get"/>

+        <size name="Lightiv" mode="get"/>

         <size name="GetLightfv" mode="get"/>

         <size name="GetLightiv" mode="get"/>

     </enum>

     <enum name="CONSTANT_ATTENUATION"          count="1"  value="0x1207">

-        <size name="Lightfv"/>

-        <size name="Lightiv"/>

+        <size name="Lightfv" mode="get"/>

+        <size name="Lightiv" mode="get"/>

         <size name="GetLightfv" mode="get"/>

         <size name="GetLightiv" mode="get"/>

     </enum>

     <enum name="LINEAR_ATTENUATION"            count="1"  value="0x1208">

-        <size name="Lightfv"/>

-        <size name="Lightiv"/>

+        <size name="Lightfv" mode="get"/>

+        <size name="Lightiv" mode="get"/>

         <size name="GetLightfv" mode="get"/>

         <size name="GetLightiv" mode="get"/>

     </enum>

     <enum name="QUADRATIC_ATTENUATION"         count="1"  value="0x1209">

-        <size name="Lightfv"/>

-        <size name="Lightiv"/>

+        <size name="Lightfv" mode="get"/>

+        <size name="Lightiv" mode="get"/>

         <size name="GetLightfv" mode="get"/>

         <size name="GetLightiv" mode="get"/>

     </enum>

     <enum name="COMPILE"                                  value="0x1300"/>

     <enum name="COMPILE_AND_EXECUTE"                      value="0x1301"/>

     <enum name="BYTE"                          count="1"  value="0x1400">

-        <size name="CallLists"/>

+        <size name="CallLists" mode="get"/>

     </enum>

     <enum name="UNSIGNED_BYTE"                 count="1"  value="0x1401">

-        <size name="CallLists"/>

+        <size name="CallLists" mode="get"/>

     </enum>

     <enum name="SHORT"                         count="2"  value="0x1402">

-        <size name="CallLists"/>

+        <size name="CallLists" mode="get"/>

     </enum>

     <enum name="UNSIGNED_SHORT"                count="2"  value="0x1403">

-        <size name="CallLists"/>

+        <size name="CallLists" mode="get"/>

     </enum>

     <enum name="INT"                           count="4"  value="0x1404">

-        <size name="CallLists"/>

+        <size name="CallLists" mode="get"/>

     </enum>

     <enum name="UNSIGNED_INT"                  count="4"  value="0x1405">

-        <size name="CallLists"/>

+        <size name="CallLists" mode="get"/>

     </enum>

     <enum name="FLOAT"                         count="4"  value="0x1406">

-        <size name="CallLists"/>

+        <size name="CallLists" mode="get"/>

     </enum>

     <enum name="2_BYTES"                       count="2"  value="0x1407">

-        <size name="CallLists"/>

+        <size name="CallLists" mode="get"/>

     </enum>

     <enum name="3_BYTES"                       count="3"  value="0x1408">

-        <size name="CallLists"/>

+        <size name="CallLists" mode="get"/>

     </enum>

     <enum name="4_BYTES"                       count="4"  value="0x1409">

-        <size name="CallLists"/>

+        <size name="CallLists" mode="get"/>

     </enum>

     <enum name="HALF_FLOAT"                    count="2"  value="0x140B">

-        <size name="CallLists"/>

+        <size name="CallLists" mode="get"/>

     </enum>

     <enum name="CLEAR"                                    value="0x1500"/>

     <enum name="AND"                                      value="0x1501"/>

@@ -886,26 +886,26 @@
     <enum name="NAND"                                     value="0x150E"/>

     <enum name="SET"                                      value="0x150F"/>

     <enum name="EMISSION"                      count="4"  value="0x1600">

-        <size name="Materialfv"/>

-        <size name="Materialiv"/>

+        <size name="Materialfv" mode="get"/>

+        <size name="Materialiv" mode="get"/>

         <size name="GetMaterialfv" mode="get"/>

         <size name="GetMaterialiv" mode="get"/>

     </enum>

     <enum name="SHININESS"                     count="1"  value="0x1601">

-        <size name="Materialfv"/>

-        <size name="Materialiv"/>

+        <size name="Materialfv" mode="get"/>

+        <size name="Materialiv" mode="get"/>

         <size name="GetMaterialfv" mode="get"/>

         <size name="GetMaterialiv" mode="get"/>

     </enum>

     <enum name="AMBIENT_AND_DIFFUSE"           count="4"  value="0x1602">

-        <size name="Materialfv"/>

-        <size name="Materialiv"/>

+        <size name="Materialfv" mode="get"/>

+        <size name="Materialiv" mode="get"/>

         <size name="GetMaterialfv" mode="get"/>

         <size name="GetMaterialiv" mode="get"/>

     </enum>

     <enum name="COLOR_INDEXES"                 count="3"  value="0x1603">

-        <size name="Materialfv"/>

-        <size name="Materialiv"/>

+        <size name="Materialfv" mode="get"/>

+        <size name="Materialiv" mode="get"/>

         <size name="GetMaterialfv" mode="get"/>

         <size name="GetMaterialiv" mode="get"/>

     </enum>

@@ -950,14 +950,14 @@
     <enum name="MODULATE"                                 value="0x2100"/>

     <enum name="DECAL"                                    value="0x2101"/>

     <enum name="TEXTURE_ENV_MODE"              count="1"  value="0x2200">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="TEXTURE_ENV_COLOR"             count="4"  value="0x2201">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

@@ -966,25 +966,25 @@
     <enum name="OBJECT_LINEAR"                            value="0x2401"/>

     <enum name="SPHERE_MAP"                               value="0x2402"/>

     <enum name="TEXTURE_GEN_MODE"              count="1"  value="0x2500">

-        <size name="TexGendv"/>

-        <size name="TexGenfv"/>

-        <size name="TexGeniv"/>

+        <size name="TexGendv" mode="get"/>

+        <size name="TexGenfv" mode="get"/>

+        <size name="TexGeniv" mode="get"/>

         <size name="GetTexGendv" mode="get"/>

         <size name="GetTexGenfv" mode="get"/>

         <size name="GetTexGeniv" mode="get"/>

     </enum>

     <enum name="OBJECT_PLANE"                  count="4"  value="0x2501">

-        <size name="TexGendv"/>

-        <size name="TexGenfv"/>

-        <size name="TexGeniv"/>

+        <size name="TexGendv" mode="get"/>

+        <size name="TexGenfv" mode="get"/>

+        <size name="TexGeniv" mode="get"/>

         <size name="GetTexGendv" mode="get"/>

         <size name="GetTexGenfv" mode="get"/>

         <size name="GetTexGeniv" mode="get"/>

     </enum>

     <enum name="EYE_PLANE"                     count="4"  value="0x2502">

-        <size name="TexGendv"/>

-        <size name="TexGenfv"/>

-        <size name="TexGeniv"/>

+        <size name="TexGendv" mode="get"/>

+        <size name="TexGenfv" mode="get"/>

+        <size name="TexGeniv" mode="get"/>

         <size name="GetTexGendv" mode="get"/>

         <size name="GetTexGenfv" mode="get"/>

         <size name="GetTexGeniv" mode="get"/>

@@ -996,26 +996,26 @@
     <enum name="NEAREST_MIPMAP_LINEAR"                    value="0x2702"/>

     <enum name="LINEAR_MIPMAP_LINEAR"                     value="0x2703"/>

     <enum name="TEXTURE_MAG_FILTER"            count="1"  value="0x2800">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_MIN_FILTER"            count="1"  value="0x2801">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_WRAP_S"                count="1"  value="0x2802">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_WRAP_T"                count="1"  value="0x2803">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -3039,8 +3039,8 @@
     <enum name="PROXY_TEXTURE_1D"                         value="0x8063"/>

     <enum name="PROXY_TEXTURE_2D"                         value="0x8064"/>

     <enum name="TEXTURE_PRIORITY"              count="1"  value="0x8066">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -3380,8 +3380,8 @@
         <size name="GetTexLevelParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_WRAP_R"                count="1"  value="0x8072">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -3405,32 +3405,32 @@
     </enum>

     <enum name="CLAMP_TO_EDGE"                            value="0x812F"/>

     <enum name="TEXTURE_MIN_LOD"               count="1"  value="0x813A">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_MAX_LOD"               count="1"  value="0x813B">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_BASE_LEVEL"            count="1"  value="0x813C">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_MAX_LEVEL"             count="1"  value="0x813D">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="LIGHT_MODEL_COLOR_CONTROL"     count="1"  value="0x81F8">

-        <size name="LightModelfv"/>

-        <size name="LightModeliv"/>

+        <size name="LightModelfv" mode="get"/>

+        <size name="LightModeliv" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="SINGLE_COLOR"                             value="0x81F9"/>

@@ -3482,26 +3482,26 @@
     </enum>

 

     <enum name="CONVOLUTION_BORDER_MODE"       count="1"  value="0x8013">

-        <size name="ConvolutionParameterfv"/>

-        <size name="ConvolutionParameteriv"/>

+        <size name="ConvolutionParameterfv" mode="get"/>

+        <size name="ConvolutionParameteriv" mode="get"/>

         <size name="GetConvolutionParameterfv" mode="get"/>

         <size name="GetConvolutionParameteriv" mode="get"/>

     </enum>

     <enum name="CONVOLUTION_BORDER_COLOR"      count="4"  value="0x8154">

-        <size name="ConvolutionParameterfv"/>

-        <size name="ConvolutionParameteriv"/>

+        <size name="ConvolutionParameterfv" mode="get"/>

+        <size name="ConvolutionParameteriv" mode="get"/>

         <size name="GetConvolutionParameterfv" mode="get"/>

         <size name="GetConvolutionParameteriv" mode="get"/>

     </enum>

     <enum name="CONVOLUTION_FILTER_SCALE"      count="4"  value="0x8014">

-        <size name="ConvolutionParameterfv"/>

-        <size name="ConvolutionParameteriv"/>

+        <size name="ConvolutionParameterfv" mode="get"/>

+        <size name="ConvolutionParameteriv" mode="get"/>

         <size name="GetConvolutionParameterfv" mode="get"/>

         <size name="GetConvolutionParameteriv" mode="get"/>

     </enum>

     <enum name="CONVOLUTION_FILTER_BIAS"       count="4"  value="0x8015">

-        <size name="ConvolutionParameterfv"/>

-        <size name="ConvolutionParameteriv"/>

+        <size name="ConvolutionParameterfv" mode="get"/>

+        <size name="ConvolutionParameteriv" mode="get"/>

         <size name="GetConvolutionParameterfv" mode="get"/>

         <size name="GetConvolutionParameteriv" mode="get"/>

     </enum>

@@ -3649,14 +3649,14 @@
     <enum name="PROXY_POST_COLOR_MATRIX_COLOR_TABLE"            value="0x80D5"/>

 

     <enum name="COLOR_TABLE_SCALE"             count="4"  value="0x80D6">

-        <size name="ColorTableParameterfv"/>

-        <size name="ColorTableParameteriv"/>

+        <size name="ColorTableParameterfv" mode="get"/>

+        <size name="ColorTableParameteriv" mode="get"/>

         <size name="GetColorTableParameterfv" mode="get"/>

         <size name="GetColorTableParameteriv" mode="get"/>

     </enum>

     <enum name="COLOR_TABLE_BIAS"              count="4"  value="0x80D7">

-        <size name="ColorTableParameterfv"/>

-        <size name="ColorTableParameteriv"/>

+        <size name="ColorTableParameterfv" mode="get"/>

+        <size name="ColorTableParameteriv" mode="get"/>

         <size name="GetColorTableParameterfv" mode="get"/>

         <size name="GetColorTableParameteriv" mode="get"/>

     </enum>

@@ -4133,92 +4133,92 @@
     <enum name="CLAMP_TO_BORDER"                          value="0x812D"/>

     <enum name="COMBINE"                                  value="0x8570"/>

     <enum name="COMBINE_RGB"                   count="1"  value="0x8571">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="COMBINE_ALPHA"                 count="1"  value="0x8572">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="SOURCE0_RGB"                   count="1"  value="0x8580">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="SOURCE1_RGB"                   count="1"  value="0x8581">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="SOURCE2_RGB"                   count="1"  value="0x8582">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="SOURCE0_ALPHA"                 count="1"  value="0x8588">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="SOURCE1_ALPHA"                 count="1"  value="0x8589">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="SOURCE2_ALPHA"                 count="1"  value="0x858A">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="OPERAND0_RGB"                  count="1"  value="0x8590">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="OPERAND1_RGB"                  count="1"  value="0x8591">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="OPERAND2_RGB"                  count="1"  value="0x8592">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="OPERAND0_ALPHA"                count="1"  value="0x8598">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="OPERAND1_ALPHA"                count="1"  value="0x8599">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="OPERAND2_ALPHA"                count="1"  value="0x859A">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="RGB_SCALE"                     count="1"  value="0x8573">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

@@ -4534,24 +4534,24 @@
         <size name="Get" mode="get"/>

     </enum>

     <enum name="POINT_SIZE_MIN"                count="1"  value="0x8126">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="POINT_SIZE_MAX"                count="1"  value="0x8127">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="POINT_FADE_THRESHOLD_SIZE"     count="1"  value="0x8128">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="POINT_DISTANCE_ATTENUATION"    count="3"  value="0x8129">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="GENERATE_MIPMAP"               count="1"  value="0x8191">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -4600,10 +4600,10 @@
     </enum>

     <enum name="TEXTURE_FILTER_CONTROL"                   value="0x8500"/>

     <enum name="TEXTURE_LOD_BIAS"              count="1"  value="0x8501">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

@@ -4616,20 +4616,20 @@
         <size name="GetTexLevelParameteriv" mode="get"/>

     </enum>

     <enum name="DEPTH_TEXTURE_MODE"            count="1"  value="0x884B">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_COMPARE_MODE"          count="1"  value="0x884C">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_COMPARE_FUNC"          count="1"  value="0x884D">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -5121,8 +5121,8 @@
     <enum name="SHADING_LANGUAGE_VERSION"         value="0x8B8C"/>

     <enum name="CURRENT_PROGRAM"                  value="0x8B8D"/>

     <enum name="POINT_SPRITE_COORD_ORIGIN" count="1"  value="0x8CA0">

-        <size name="PointParameterfvEXT"/>

-        <size name="PointParameterivNV"/>

+        <size name="PointParameterfvEXT" mode="get"/>

+        <size name="PointParameterivNV" mode="get"/>

     </enum>

     <enum name="LOWER_LEFT"                       value="0x8CA1"/>

     <enum name="UPPER_LEFT"                       value="0x8CA2"/>

@@ -6226,16 +6226,16 @@
 

 <category name="GL_ARB_point_parameters" number="14">

     <enum name="POINT_SIZE_MIN_ARB"            count="1"  value="0x8126">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

     </enum>

     <enum name="POINT_SIZE_MAX_ARB"            count="1"  value="0x8127">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

     </enum>

     <enum name="POINT_FADE_THRESHOLD_SIZE_ARB" count="1"  value="0x8128">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

     </enum>

     <enum name="POINT_DISTANCE_ATTENUATION_ARB" count="3" value="0x8129">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

     </enum>

 

     <function name="PointParameterfARB" alias="PointParameterfEXT">

@@ -6541,8 +6541,8 @@
         <size name="GetTexLevelParameteriv" mode="get"/>

     </enum>

     <enum name="DEPTH_TEXTURE_MODE_ARB"        count="1"  value="0x884B">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -6550,14 +6550,14 @@
 

 <category name="GL_ARB_shadow" number="23">

     <enum name="TEXTURE_COMPARE_MODE_ARB"      count="1"  value="0x884C">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_COMPARE_FUNC_ARB"      count="1"  value="0x884D">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -6566,8 +6566,8 @@
 

 <category name="GL_ARB_shadow_ambient" number="24">

     <enum name="TEXTURE_COMPARE_FAIL_VALUE_ARB" count="1" value="0x80BF">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -7865,8 +7865,8 @@
         <size name="Get" mode="get"/>

     </enum>

     <enum name="COORD_REPLACE_ARB"             count="1"  value="0x8862">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

@@ -8317,20 +8317,20 @@
 

 <category name="GL_EXT_convolution" number="12">

     <enum name="CONVOLUTION_BORDER_MODE_EXT"   count="1"  value="0x8013">

-        <size name="ConvolutionParameterfv"/>

-        <size name="ConvolutionParameteriv"/>

+        <size name="ConvolutionParameterfv" mode="get"/>

+        <size name="ConvolutionParameteriv" mode="get"/>

         <size name="GetConvolutionParameterfv" mode="get"/>

         <size name="GetConvolutionParameteriv" mode="get"/>

     </enum>

     <enum name="CONVOLUTION_FILTER_SCALE_EXT"  count="4"  value="0x8014">

-        <size name="ConvolutionParameterfv"/>

-        <size name="ConvolutionParameteriv"/>

+        <size name="ConvolutionParameterfv" mode="get"/>

+        <size name="ConvolutionParameteriv" mode="get"/>

         <size name="GetConvolutionParameterfv" mode="get"/>

         <size name="GetConvolutionParameteriv" mode="get"/>

     </enum>

     <enum name="CONVOLUTION_FILTER_BIAS_EXT"   count="4"  value="0x8015">

-        <size name="ConvolutionParameterfv"/>

-        <size name="ConvolutionParameteriv"/>

+        <size name="ConvolutionParameterfv" mode="get"/>

+        <size name="ConvolutionParameteriv" mode="get"/>

         <size name="GetConvolutionParameterfv" mode="get"/>

         <size name="GetConvolutionParameteriv" mode="get"/>

     </enum>

@@ -8840,8 +8840,8 @@
 

 <category name="GL_SGIS_generate_mipmap" number="32">

     <enum name="GENERATE_MIPMAP_SGIS"          count="1"  value="0x8191">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -8851,26 +8851,26 @@
 <category name="GL_SGIX_clipmap" number="33">

     <enum name="LINEAR_CLIPMAP_LINEAR_SGIX"               value="0x8170"/>

     <enum name="TEXTURE_CLIPMAP_CENTER_SGIX"   count="2"  value="0x8171">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_CLIPMAP_FRAME_SGIX"    count="1"  value="0x8172">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_CLIPMAP_OFFSET_SGIX"   count="2"  value="0x8173">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX" count="3" value="0x8174">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -8885,14 +8885,14 @@
 

 <category name="GL_SGIX_shadow" number="34">

     <enum name="TEXTURE_COMPARE_SGIX"          count="1"  value="0x819A">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_COMPARE_OPERATOR_SGIX" count="1"  value="0x819B">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -8969,16 +8969,16 @@
 

 <category name="GL_EXT_point_parameters" number="54">

     <enum name="POINT_SIZE_MIN_EXT"            count="1"  value="0x8126">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

     </enum>

     <enum name="POINT_SIZE_MAX_EXT"            count="1"  value="0x8127">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

     </enum>

     <enum name="POINT_FADE_THRESHOLD_SIZE_EXT" count="1"  value="0x8128">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

     </enum>

     <enum name="POINT_DISTANCE_ATTENUATION_EXT" count="3" value="0x8129">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

     </enum>

 

     <function name="PointParameterfEXT" offset="assign">

@@ -9029,14 +9029,14 @@
 

 <category name="GL_SGIX_texture_scale_bias" number="56">

     <enum name="POST_TEXTURE_FILTER_BIAS_SGIX"  count="4" value="0x8179">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="POST_TEXTURE_FILTER_SCALE_SGIX" count="4" value="0x817A">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -9096,8 +9096,8 @@
 <category name="GL_SGIX_fog_offset" number="65">

     <enum name="FOG_OFFSET_SGIX"                          value="0x8198"/>

     <enum name="FOG_OFFSET_VALUE_SGIX"         count="1"  value="0x8199">

-        <size name="Fogfv"/>

-        <size name="Fogiv"/>

+        <size name="Fogfv" mode="get"/>

+        <size name="Fogiv" mode="get"/>

     </enum>

 </category>

 

@@ -9144,8 +9144,8 @@
     <enum name="CONSTANT_BORDER_HP"                       value="0x8151"/>

     <enum name="REPLICATE_BORDER_HP"                      value="0x8153"/>

     <enum name="CONVOLUTION_BORDER_COLOR_HP"   count="4"  value="0x8154">

-        <size name="ConvolutionParameterfv"/>

-        <size name="ConvolutionParameteriv"/>

+        <size name="ConvolutionParameterfv" mode="get"/>

+        <size name="ConvolutionParameteriv" mode="get"/>

         <size name="GetConvolutionParameterfv" mode="get"/>

         <size name="GetConvolutionParameteriv" mode="get"/>

     </enum>

@@ -9311,20 +9311,20 @@
 

 <category name="GL_SGIX_texture_lod_bias" number="84">

     <enum name="TEXTURE_LOD_BIAS_S_SGIX"       count="1"  value="0x818E">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_LOD_BIAS_T_SGIX"       count="1"  value="0x818F">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_LOD_BIAS_R_SGIX"       count="1"  value="0x8190">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -9339,8 +9339,8 @@
 

 <category name="GL_SGIX_shadow_ambient" number="90">

     <enum name="SHADOW_AMBIENT_SGIX"           count="1"  value="0x80BF">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -9684,8 +9684,8 @@
 

 <category name="GL_EXT_separate_specular_color" number="144">

     <enum name="LIGHT_MODEL_COLOR_CONTROL_EXT" count="1"  value="0x81F8">

-        <size name="LightModelfv"/>

-        <size name="LightModeliv"/>

+        <size name="LightModelfv" mode="get"/>

+        <size name="LightModeliv" mode="get"/>

     </enum>

     <enum name="SINGLE_COLOR_EXT"                         value="0x81F9"/>

     <enum name="SEPARATE_SPECULAR_COLOR_EXT"              value="0x81FA"/>

@@ -10458,8 +10458,8 @@
 

 <category name="GL_EXT_texture_lod_bias" number="186">

     <enum name="TEXTURE_LOD_BIAS_EXT"          count="1"  value="0x8501">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -10467,8 +10467,8 @@
 

 <category name="GL_EXT_texture_filter_anisotropic" number="187">

     <enum name="TEXTURE_MAX_ANISOTROPY_EXT"    count="1"  value="0x84FE">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -10626,8 +10626,8 @@
 

 <category name="GL_NV_fog_distance" number="192">

     <enum name="FOG_DISTANCE_MODE_NV"          count="1"  value="0x855A">

-        <size name="Fogfv"/>

-        <size name="Fogiv"/>

+        <size name="Fogfv" mode="get"/>

+        <size name="Fogiv" mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

     <enum name="EYE_RADIAL_NV"                            value="0x855B"/>

@@ -10641,26 +10641,26 @@
 <category name="GL_NV_texture_env_combine4" number="195">

     <enum name="COMBINE4"                                 value="0x8503"/>

     <enum name="SOURCE3_RGB_NV"                count="1"  value="0x8583">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="SOURCE3_ALPHA_NV"              count="1"  value="0x858B">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="OPERAND3_RGB_NV"               count="1"  value="0x8593">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="OPERAND3_ALPHA_NV"             count="1"  value="0x859B">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

@@ -11681,20 +11681,20 @@
 

 <category name="GL_SGIX_texture_coordinate_clamp" number="235">

     <enum name="TEXTURE_MAX_CLAMP_S_SGIX"      count="1"  value="0x8369">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_MAX_CLAMP_T_SGIX"      count="1"  value="0x836A">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

     <enum name="TEXTURE_MAX_CLAMP_R_SGIX"      count="1"  value="0x836B">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -11733,8 +11733,8 @@
     <enum name="DU8DV8_ATI"                               value="0x877A"/>

     <enum name="BUMP_ENVMAP_ATI"                          value="0x877B"/>

     <enum name="BUMP_TARGET_ATI"              count="1"   value="0x877C">

-        <size name="TexEnviv"/>

-        <size name="TexEnvfv"/>

+        <size name="TexEnviv" mode="get"/>

+        <size name="TexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

     </enum>

@@ -11927,30 +11927,30 @@
          added for this extension. -->

 

     <enum name="POINT_SIZE_MIN_EXT"            count="1"  value="0x8126">

-        <size name="PointParameterivNV"/>

+        <size name="PointParameterivNV" mode="get"/>

     </enum>

     <enum name="POINT_SIZE_MAX_EXT"            count="1"  value="0x8127">

-        <size name="PointParameterivNV"/>

+        <size name="PointParameterivNV" mode="get"/>

     </enum>

     <enum name="POINT_FADE_THRESHOLD_SIZE_EXT" count="1"  value="0x8128">

-        <size name="PointParameterivNV"/>

+        <size name="PointParameterivNV" mode="get"/>

     </enum>

     <enum name="POINT_DISTANCE_ATTENUATION_EXT" count="3" value="0x8129">

-        <size name="PointParameterivNV"/>

+        <size name="PointParameterivNV" mode="get"/>

     </enum>

 

     <enum name="POINT_SPRITE_NV"               count="1"  value="0x8861">

         <size name="Get" mode="get"/>

     </enum>

     <enum name="COORD_REPLACE_NV"              count="1"  value="0x8862">

-        <size name="TexEnvfv"/>

-        <size name="TexEnviv"/>

+        <size name="TexEnvfv" mode="get"/>

+        <size name="TexEnviv" mode="get"/>

         <size name="GetTexEnvfv" mode="get"/>

         <size name="GetTexEnviv" mode="get"/>

     </enum>

     <enum name="POINT_SPRITE_R_MODE_NV"        count="1"  value="0x8863">

-        <size name="PointParameterfvEXT"/>

-        <size name="PointParameterivNV"/>

+        <size name="PointParameterfvEXT" mode="get"/>

+        <size name="PointParameterivNV"  mode="get"/>

         <size name="Get" mode="get"/>

     </enum>

 

@@ -12129,8 +12129,8 @@
 

 <category name="GL_NV_texture_expand_normal" number="286">

     <enum name="TEXTURE_UNSIGNED_REMAP_MODE_NV" count="1" value="0x888F">

-        <size name="TexParameterfv"/>

-        <size name="TexParameteriv"/>

+        <size name="TexParameterfv" mode="get"/>

+        <size name="TexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

     </enum>

@@ -12284,22 +12284,22 @@
 

 <category name="GL_APPLE_texture_range" number="367">

     <enum name="TEXTURE_STORAGE_HINT_APPLE" count="1" value="0x85BC">

-        <size name="TexParameteriv"/>

-        <size name="TexParameterfv"/>

+        <size name="TexParameteriv" mode="get"/>

+        <size name="TexParameterfv" mode="get"/>

         <size name="GetTexParameteriv" mode="get"/>

         <size name="GetTexParameterfv" mode="get"/>

     </enum>

     <enum name="STORAGE_PRIVATE_APPLE" count="1" value="0x85BD">

-        <size name="TexParameteriv"/>

-        <size name="TexParameterfv"/>

+        <size name="TexParameteriv" mode="get"/>

+        <size name="TexParameterfv" mode="get"/>

     </enum>

     <enum name="STORAGE_CACHED_APPLE" count="1" value="0x85BE">

-        <size name="TexParameteriv"/>

-        <size name="TexParameterfv"/>

+        <size name="TexParameteriv" mode="get"/>

+        <size name="TexParameterfv" mode="get"/>

     </enum>

     <enum name="STORAGE_SHARED_APPLE" count="1" value="0x85BF">

-        <size name="TexParameteriv"/>

-        <size name="TexParameterfv"/>

+        <size name="TexParameteriv" mode="get"/>

+        <size name="TexParameterfv" mode="get"/>

     </enum>

     <enum name="TEXTURE_RANGE_LENGTH_APPLE" count="1" value="0x85B7">

         <size name="GetTexParameteriv" mode="get"/>

@@ -12442,16 +12442,16 @@
 

 <category name="GL_SGIS_point_parameters">

     <enum name="POINT_SIZE_MIN_SGIS"           count="1"  value="0x8126">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

     </enum>

     <enum name="POINT_SIZE_MAX_SGIS"           count="1"  value="0x8127">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

     </enum>

     <enum name="POINT_FADE_THRESHOLD_SIZE_SGIS" count="1" value="0x8128">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

     </enum>

     <enum name="POINT_DISTANCE_ATTENUATION_SGIS" count="3" value="0x8129">

-        <size name="PointParameterfvEXT"/>

+        <size name="PointParameterfvEXT" mode="get"/>

     </enum>

 

     <function name="PointParameterfSGIS" alias="PointParameterfEXT" static_dispatch="false">

diff --git a/mesalib/src/mapi/glapi/glapi.h b/mesalib/src/mapi/glapi/glapi.h
index 1d4ac4674..a99317ad0 100644
--- a/mesalib/src/mapi/glapi/glapi.h
+++ b/mesalib/src/mapi/glapi/glapi.h
@@ -39,12 +39,9 @@
  * This module is intended to be non-Mesa-specific so it can be used

  * with the X/DRI libGL also.

  */

-

-

 #ifndef _GLAPI_H

 #define _GLAPI_H

 

-

 #ifdef _GLAPI_NO_EXPORTS

 #  define _GLAPI_EXPORT

 #else /* _GLAPI_NO_EXPORTS */

@@ -72,7 +69,7 @@
 #define _glapi_Context _mglapi_Context

 #endif

 

-#include "glapi/glthread.h"

+#include "glthread.h"

 

 typedef void (*_glapi_proc)(void);

 struct _glapi_table;

@@ -94,8 +91,14 @@ _GLAPI_EXPORT extern const void *_glapi_Context;
 

 #else

 

-_GLAPI_EXPORT extern struct _glapi_table *_glapi_Dispatch;

-_GLAPI_EXPORT extern void *_glapi_Context;

+#ifdef INSERVER

+#define SERVEXTERN _declspec(dllimport)

+#else

+#define SERVEXTERN _declspec(dllexport)

+#endif

+

+SERVEXTERN struct _glapi_table *_glapi_Dispatch;

+SERVEXTERN void *_glapi_Context;

 

 # ifdef THREADS

 

@@ -119,31 +122,31 @@ void
 _glapi_destroy_multithread(void);

 

 

-_GLAPI_EXPORT void

+SERVEXTERN void

 _glapi_check_multithread(void);

 

 

-_GLAPI_EXPORT void

+SERVEXTERN void

 _glapi_set_context(void *context);

 

 

-_GLAPI_EXPORT void *

+SERVEXTERN void *

 _glapi_get_context(void);

 

 

-_GLAPI_EXPORT void

+SERVEXTERN void

 _glapi_set_dispatch(struct _glapi_table *dispatch);

 

 

-_GLAPI_EXPORT struct _glapi_table *

+SERVEXTERN struct _glapi_table *

 _glapi_get_dispatch(void);

 

 

-_GLAPI_EXPORT unsigned int

+SERVEXTERN unsigned int

 _glapi_get_dispatch_table_size(void);

 

 

-_GLAPI_EXPORT int

+SERVEXTERN int

 _glapi_add_dispatch( const char * const * function_names,

 		     const char * parameter_signature );

 

@@ -166,7 +169,7 @@ _glthread_GetID(void);
 /*

  * These stubs are kept so that the old DRI drivers still load.

  */

-_GLAPI_EXPORT void

+SERVEXTERN void

 _glapi_noop_enable_warnings(unsigned char enable);

 

 

diff --git a/mesalib/src/mapi/glapi/glapi_getproc.c b/mesalib/src/mapi/glapi/glapi_getproc.c
index 21380ea41..d5c72f29b 100644
--- a/mesalib/src/mapi/glapi/glapi_getproc.c
+++ b/mesalib/src/mapi/glapi/glapi_getproc.c
@@ -369,6 +369,7 @@ set_entry_info( struct _glapi_function * entry, const char * signature, unsigned
  * the parameter signature of a static function.

  */

 

+#ifndef INSERVER

 int

 _glapi_add_dispatch( const char * const * function_names,

 		     const char * parameter_signature )

@@ -478,12 +479,12 @@ _glapi_add_dispatch( const char * const * function_names,
 

    return offset;

 }

-

+#endif

 

 /**

  * Return offset of entrypoint for named function within dispatch table.

  */

-GLint

+GLint _GLAPI_EXPORT

 _glapi_get_proc_offset(const char *funcName)

 {

    GLint offset;

@@ -504,7 +505,7 @@ _glapi_get_proc_offset(const char *funcName)
  * in the name of static functions, try generating a new API entrypoint on

  * the fly with assembly language.

  */

-_glapi_proc

+_glapi_proc _GLAPI_EXPORT

 _glapi_get_proc_address(const char *funcName)

 {

    _glapi_proc func;

@@ -545,7 +546,7 @@ _glapi_get_proc_address(const char *funcName)
  * Return the name of the function at the given dispatch offset.

  * This is only intended for debugging.

  */

-const char *

+const char * _GLAPI_EXPORT

 _glapi_get_proc_name(GLuint offset)

 {

    const char * n;

@@ -571,7 +572,7 @@ _glapi_get_proc_name(GLuint offset)
  * Return size of dispatch table struct as number of functions (or

  * slots).

  */

-GLuint

+GLuint _GLAPI_EXPORT

 _glapi_get_dispatch_table_size(void)

 {

    /*

diff --git a/mesalib/src/mapi/glapi/glapi_nop.c b/mesalib/src/mapi/glapi/glapi_nop.c
index 9b0929715..365a6e1c8 100644
--- a/mesalib/src/mapi/glapi/glapi_nop.c
+++ b/mesalib/src/mapi/glapi/glapi_nop.c
@@ -41,12 +41,12 @@
 #include "glapi/glapi_priv.h"
 
 
-void
+void _GLAPI_EXPORT
 _glapi_noop_enable_warnings(unsigned char enable)
 {
 }
 
-void
+void _GLAPI_EXPORT
 _glapi_set_warning_func(_glapi_proc func)
 {
 }
diff --git a/mesalib/src/mapi/glapi/glthread.c b/mesalib/src/mapi/glapi/glthread.c
index 00915380f..239090ecf 100644
--- a/mesalib/src/mapi/glapi/glthread.c
+++ b/mesalib/src/mapi/glapi/glthread.c
@@ -1,6 +1,6 @@
 #include "glapi/glapi.h"
 
-unsigned long
+unsigned long _GLAPI_EXPORT
 _glthread_GetID(void)
 {
    return u_thread_self();
diff --git a/mesalib/src/mesa/drivers/dri/common/utils.c b/mesalib/src/mesa/drivers/dri/common/utils.c
index a2b0b4e94..02c8cc6f5 100644
--- a/mesalib/src/mesa/drivers/dri/common/utils.c
+++ b/mesalib/src/mesa/drivers/dri/common/utils.c
@@ -219,7 +219,9 @@ void driInitExtensions( struct gl_context * ctx,
       /* Map the static functions.  Together with those mapped by remap

        * table, this should cover everything mesa core knows.

        */

+#ifdef _GLAPI_USE_REMAP_TABLE

       _mesa_map_static_functions();

+#endif

       return;

    }

 

diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast.c b/mesalib/src/mesa/drivers/dri/swrast/swrast.c
index 3ac32b1b4..1207825a7 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"

@@ -171,7 +176,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;

     }

@@ -182,7 +187,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;

     }

@@ -720,15 +725,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 4c3c9830f..e61965147 100644
--- a/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h
+++ b/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h
@@ -32,6 +32,13 @@
 #include "main/mtypes.h"

 #include "drisw_util.h"

 

+#ifdef _MSC_VER

+#ifdef PUBLIC

+#undef PUBLIC

+#endif

+#define PUBLIC __declspec(dllexport)

+#endif

+

 

 /**

  * Debugging

diff --git a/mesalib/src/mesa/main/api_arrayelt.c b/mesalib/src/mesa/main/api_arrayelt.c
index 080c20606..3c59e9be3 100644
--- a/mesalib/src/mesa/main/api_arrayelt.c
+++ b/mesalib/src/mesa/main/api_arrayelt.c
@@ -51,7 +51,7 @@ typedef struct {
    int offset;

 } AEarray;

 

-typedef void (GLAPIENTRY *attrib_func)( GLuint indx, const void *data );

+typedef void (*attrib_func)( GLuint indx, const void *data );

 

 typedef struct {

    const struct gl_client_array *array;

diff --git a/mesalib/src/mesa/main/api_exec.c b/mesalib/src/mesa/main/api_exec.c
index d7a4c90d7..02e39c189 100644
--- a/mesalib/src/mesa/main/api_exec.c
+++ b/mesalib/src/mesa/main/api_exec.c
@@ -104,7 +104,6 @@
 

 #if FEATURE_GL

 

-

 /**

  * Initialize a dispatch table with pointers to Mesa's immediate-mode

  * commands.

diff --git a/mesalib/src/mesa/main/bufferobj.c b/mesalib/src/mesa/main/bufferobj.c
index 31475529e..e971ee558 100644
--- a/mesalib/src/mesa/main/bufferobj.c
+++ b/mesalib/src/mesa/main/bufferobj.c
@@ -197,7 +197,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;

@@ -215,7 +215,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 )

 {

    (void) ctx;

@@ -336,7 +336,7 @@ _mesa_initialize_buffer_object( struct gl_buffer_object *obj,
  * \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 )

@@ -380,7 +380,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, GLenum target, GLintptrARB offset,

 		      GLsizeiptrARB size, const GLvoid * data,

 		      struct gl_buffer_object * bufObj )

@@ -413,7 +413,7 @@ _mesa_buffer_subdata( struct gl_context *ctx, GLenum target, GLintptrARB offset,
  *

  * \sa glBufferGetSubDataARB, dd_function_table::GetBufferSubData.

  */

-static void

+void

 _mesa_buffer_get_subdata( struct gl_context *ctx, GLenum target, GLintptrARB offset,

 			  GLsizeiptrARB size, GLvoid * data,

 			  struct gl_buffer_object * bufObj )

@@ -440,7 +440,7 @@ _mesa_buffer_get_subdata( struct gl_context *ctx, GLenum target, GLintptrARB off
  *

  * \sa glMapBufferARB, dd_function_table::MapBuffer

  */

-static void *

+void *

 _mesa_buffer_map( struct gl_context *ctx, GLenum target, GLenum access,

 		  struct gl_buffer_object *bufObj )

 {

@@ -505,7 +505,7 @@ _mesa_buffer_flush_mapped_range( struct gl_context *ctx, GLenum target,
  *

  * \sa glUnmapBufferARB, dd_function_table::UnmapBuffer

  */

-static GLboolean

+GLboolean

 _mesa_buffer_unmap( struct gl_context *ctx, GLenum target,

                     struct gl_buffer_object *bufObj )

 {

diff --git a/mesalib/src/mesa/main/compiler.h b/mesalib/src/mesa/main/compiler.h
index 41cd48bc6..c1d773b18 100644
--- a/mesalib/src/mesa/main/compiler.h
+++ b/mesalib/src/mesa/main/compiler.h
@@ -60,29 +60,7 @@ extern "C" {
 /**

  * Get standard integer types

  */

-#if defined(_MSC_VER)

-   typedef __int8             int8_t;

-   typedef unsigned __int8    uint8_t;

-   typedef __int16            int16_t;

-   typedef unsigned __int16   uint16_t;

-   typedef __int32            int32_t;

-   typedef unsigned __int32   uint32_t;

-   typedef __int64            int64_t;

-   typedef unsigned __int64   uint64_t;

-

-#  if defined(_WIN64)

-     typedef __int64            intptr_t;

-     typedef unsigned __int64   uintptr_t;

-#  else

-     typedef __int32            intptr_t;

-     typedef unsigned __int32   uintptr_t;

-#  endif

-

-#  define INT64_C(__val) __val##i64

-#  define UINT64_C(__val) __val##ui64

-#else

-#  include <stdint.h>

-#endif

+#include <stdint.h>

 

 

 /**

diff --git a/mesalib/src/mesa/main/dlopen.c b/mesalib/src/mesa/main/dlopen.c
index 57a33292e..62d9023a9 100644
--- a/mesalib/src/mesa/main/dlopen.c
+++ b/mesalib/src/mesa/main/dlopen.c
@@ -51,7 +51,7 @@ _mesa_dlopen(const char *libname, int flags)
 #elif defined(_GNU_SOURCE)
    flags = RTLD_LAZY | RTLD_GLOBAL; /* Overriding flags at this time */
    return dlopen(libname, flags);
-#elif defined(__MINGW32__)
+#elif defined(__MINGW32__) | defined(_MSC_VER)
    return LoadLibraryA(libname);
 #else
    return NULL;
@@ -82,7 +82,7 @@ _mesa_dlsym(void *handle, const char *fname)
    u.v = dlsym(handle, fname2);
 #elif defined(_GNU_SOURCE)
    u.v = dlsym(handle, fname);
-#elif defined(__MINGW32__)
+#elif defined(__MINGW32__) | defined(_MSC_VER)
    u.v = (void *) GetProcAddress(handle, fname);
 #else
    u.v = NULL;
@@ -101,7 +101,7 @@ _mesa_dlclose(void *handle)
    (void) handle;
 #elif defined(_GNU_SOURCE)
    dlclose(handle);
-#elif defined(__MINGW32__)
+#elif defined(__MINGW32__) | defined(_MSC_VER)
    FreeLibrary(handle);
 #else
    (void) handle;
diff --git a/mesalib/src/mesa/main/queryobj.c b/mesalib/src/mesa/main/queryobj.c
index 1c45c38b9..c97179f1e 100644
--- a/mesalib/src/mesa/main/queryobj.c
+++ b/mesalib/src/mesa/main/queryobj.c
@@ -43,7 +43,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);

@@ -62,7 +62,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 */

@@ -73,7 +73,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;

@@ -84,7 +84,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.

@@ -112,7 +112,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 676038430..25307a17c 100644
--- a/mesalib/src/mesa/main/syncobj.c
+++ b/mesalib/src/mesa/main/syncobj.c
@@ -125,7 +125,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;

@@ -140,7 +140,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);

@@ -156,7 +156,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;

@@ -166,7 +166,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;

@@ -182,7 +182,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);

@@ -191,7 +191,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 ac1384f61..e83ac8b0e 100644
--- a/mesalib/src/mesa/main/syncobj.h
+++ b/mesalib/src/mesa/main/syncobj.h
@@ -41,22 +41,22 @@ struct gl_sync_object;
 

 #if FEATURE_ARB_sync

 

-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 90be6c0a8..479806eca 100644
--- a/mesalib/src/mesa/main/texcompress_s3tc.c
+++ b/mesalib/src/mesa/main/texcompress_s3tc.c
@@ -50,7 +50,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/windows/VC8/mesa/gdi/gdi.vcproj b/mesalib/windows/VC8/mesa/gdi/gdi.vcproj
index 220923f90..ec2a7c941 100644
--- a/mesalib/windows/VC8/mesa/gdi/gdi.vcproj
+++ b/mesalib/windows/VC8/mesa/gdi/gdi.vcproj
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="9,00"

 	Name="gdi"

 	ProjectGUID="{A1B24907-E196-4826-B6AF-26723629B633}"

 	RootNamespace="gdi"

+	TargetFrameworkVersion="131072"

 	>

 	<Platforms>

 		<Platform

@@ -72,13 +73,15 @@
 				Name="VCLinkerTool"

 				AdditionalOptions="/MACHINE:I386"

 				AdditionalDependencies="gdi32.lib user32.lib"

-				OutputFile="$(OutDir)\OPENGL32.dll"

+				OutputFile="$(OutDir)\mesaopengl32.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="$(TargetDir)"

 				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(TargetDir)OPENGL32.pdb"

+				ProgramDatabaseFile="$(TargetDir)mesaopengl32.pdb"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -99,11 +102,8 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OPENGL32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OPENGL32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)OPENGL32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"

+				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)mesaopengl32.lib&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)mesaopengl32.dll&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)mesaopengl32.dll&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"

 			/>

 		</Configuration>

 		<Configuration

@@ -138,7 +138,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

+				InlineFunctionExpansion="2"

+				OmitFramePointers="true"

+				WholeProgramOptimization="true"

 				AdditionalIncludeDirectories="../../main,../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"

 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN"

 				StringPooling="true"

@@ -164,12 +166,15 @@
 				Name="VCLinkerTool"

 				AdditionalOptions="/MACHINE:I386"

 				AdditionalDependencies="gdi32.lib user32.lib"

-				OutputFile="$(OutDir)\OPENGL32.dll"

+				OutputFile="$(OutDir)\mesaopengl32.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="$(TargetDir)"

 				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"

-				ProgramDatabaseFile="$(TargetDir)OPENGL32.pdb"

+				ProgramDatabaseFile="$(TargetDir)mesaopengl32.pdb"

+				LinkTimeCodeGeneration="1"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -190,11 +195,8 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OPENGL32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OPENGL32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)OPENGL32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"

+				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)mesaopengl32.lib&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)mesaopengl32.dll&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)mesaopengl32.dll&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"

 			/>

 		</Configuration>

 		<Configuration

@@ -255,13 +257,15 @@
 				Name="VCLinkerTool"

 				AdditionalOptions="/MACHINE:I386"

 				AdditionalDependencies="gdi32.lib user32.lib"

-				OutputFile="$(OutDir)\OPENGL32.dll"

+				OutputFile="$(OutDir)\mesaopengl32.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="$(TargetDir)"

 				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(TargetDir)OPENGL32.pdb"

+				ProgramDatabaseFile="$(TargetDir)mesaopengl32.pdb"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -282,11 +286,8 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OPENGL32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OPENGL32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)OPENGL32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"

+				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)mesaopengl32.lib&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)mesaopengl32.dll&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)mesaopengl32.dll&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"

 			/>

 		</Configuration>

 		<Configuration

@@ -321,12 +322,17 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

+				InlineFunctionExpansion="2"

+				OmitFramePointers="true"

+				WholeProgramOptimization="true"

 				AdditionalIncludeDirectories="../../main,../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"

 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;BUILD_GL32;MESA_MINWARN"

 				StringPooling="true"

+				ExceptionHandling="0"

 				RuntimeLibrary="0"

+				BufferSecurityCheck="false"

 				EnableFunctionLevelLinking="true"

+				EnableEnhancedInstructionSet="2"

 				PrecompiledHeaderFile=".\Release/gdi.pch"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

@@ -347,12 +353,15 @@
 				Name="VCLinkerTool"

 				AdditionalOptions="/MACHINE:I386"

 				AdditionalDependencies="gdi32.lib user32.lib"

-				OutputFile="$(OutDir)\OPENGL32.dll"

+				OutputFile="$(OutDir)\mesaopengl32.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="$(TargetDir)"

 				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"

-				ProgramDatabaseFile="$(TargetDir)OPENGL32.pdb"

+				ProgramDatabaseFile="$(TargetDir)mesaopengl32.pdb"

+				LinkTimeCodeGeneration="1"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -373,11 +382,8 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OPENGL32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OPENGL32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)OPENGL32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"

+				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)mesaopengl32.lib&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)mesaopengl32.dll&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)mesaopengl32.dll&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"

 			/>

 		</Configuration>

 	</Configurations>

diff --git a/mesalib/windows/VC8/mesa/gdi/gdi.vcxproj b/mesalib/windows/VC8/mesa/gdi/gdi.vcxproj
new file mode 100644
index 000000000..71c7fc78c
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/gdi/gdi.vcxproj
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{A1B24907-E196-4826-B6AF-26723629B633}</ProjectGuid>

+    <RootNamespace>gdi</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>.\Debug/gdi.tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/mesa/main;../../../../src/mesa/glapi;../../../../src/mesa/swrast;../../../../src/mesa/shader;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <BrowseInformation>true</BrowseInformation>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CompileAs>Default</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>gdi32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)mesaopengl32.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <ModuleDefinitionFile>..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def</ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(TargetDir)mesaopengl32.pdb</ProgramDatabaseFile>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+    </Link>

+    <PostBuildEvent>

+      <Command>if not exist ..\..\..\..\lib md ..\..\..\..\lib

+copy "$(TargetDir)mesaopengl32.lib" ..\..\..\..\lib

+copy "$(TargetDir)mesaopengl32.dll" ..\..\..\..\lib

+if exist ..\..\..\..\progs\demos copy "$(TargetDir)mesaopengl32.dll" ..\..\..\..\progs\demos

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>.\Release/gdi.tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <OmitFramePointers>true</OmitFramePointers>

+      <WholeProgramOptimization>true</WholeProgramOptimization>

+      <AdditionalIncludeDirectories>../../main;../../../../include;../../../../src/mesa;../../../../src/mesa/main;../../../../src/mesa/glapi;../../../../src/mesa/swrast;../../../../src/mesa/shader;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeaderOutputFile>.\Release/gdi.pch</PrecompiledHeaderOutputFile>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <CompileAs>Default</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>gdi32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)mesaopengl32.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <ModuleDefinitionFile>..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def</ModuleDefinitionFile>

+      <ProgramDatabaseFile>$(TargetDir)mesaopengl32.pdb</ProgramDatabaseFile>

+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+    </Link>

+    <PostBuildEvent>

+      <Command>if not exist ..\..\..\..\lib md ..\..\..\..\lib

+copy "$(TargetDir)mesaopengl32.lib" ..\..\..\..\lib

+copy "$(TargetDir)mesaopengl32.dll" ..\..\..\..\lib

+if exist ..\..\..\..\progs\demos copy "$(TargetDir)mesaopengl32.dll" ..\..\..\..\progs\demos

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\common\driverfuncs.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\common\meta.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\windows\gdi\wgl.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\windows\gdi\wmesa.c" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\..\..\src\mesa\drivers\windows\gdi\colors.h" />

+    <ClInclude Include="..\..\..\..\src\mesa\drivers\common\driverfuncs.h" />

+    <ClInclude Include="..\..\..\..\src\mesa\drivers\common\meta.h" />

+    <ClInclude Include="..\..\..\..\include\GL\wmesa.h" />

+    <ClInclude Include="..\..\..\..\src\mesa\drivers\windows\gdi\wmesadef.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\mesa\mesa.vcxproj">

+      <Project>{2120c974-2717-4709-b44f-d6e6d0a56448}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/gdi/gdi.vcxproj.filters b/mesalib/windows/VC8/mesa/gdi/gdi.vcxproj.filters
new file mode 100644
index 000000000..1cad613a4
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/gdi/gdi.vcxproj.filters
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{32b43877-e1f1-4f3b-aea5-b0f7e1c2df85}</UniqueIdentifier>

+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{5ce415aa-5b50-4d19-a9d4-9375265e95a3}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{04ff9bfe-d3ec-40a2-a180-680cee67aff0}</UniqueIdentifier>

+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\common\driverfuncs.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\common\meta.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\windows\gdi\wgl.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\windows\gdi\wmesa.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def">

+      <Filter>Source Files</Filter>

+    </None>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\..\..\src\mesa\drivers\windows\gdi\colors.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\mesa\drivers\common\driverfuncs.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\mesa\drivers\common\meta.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\include\GL\wmesa.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\mesa\drivers\windows\gdi\wmesadef.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcproj b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcproj
index 6e9aef2e1..3fed6b466 100644
--- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcproj
+++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcproj
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="9,00"

 	Name="glsl_apps_compile"

 	ProjectGUID="{98AB3D51-1820-4D14-9195-75FCA6997784}"

 	RootNamespace="glsl_apps_compile"

 	Keyword="Win32Proj"

+	TargetFrameworkVersion="131072"

 	>

 	<Platforms>

 		<Platform

@@ -64,6 +65,8 @@
 				LinkIncremental="2"

 				GenerateDebugInformation="true"

 				SubSystem="1"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 				TargetMachine="1"

 			/>

 			<Tool

@@ -85,9 +88,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 				CommandLine="copy &quot;$(OutDir)\compile.exe&quot; ..\..\..\..\src\glsl\apps"

 			/>

@@ -141,6 +141,8 @@
 				SubSystem="1"

 				OptimizeReferences="2"

 				EnableCOMDATFolding="2"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 				TargetMachine="1"

 			/>

 			<Tool

@@ -162,9 +164,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 				CommandLine="copy &quot;$(OutDir)\compile.exe&quot; ..\..\..\..\src\glsl\apps"

 			/>

diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
new file mode 100644
index 000000000..e99f286a9
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{98AB3D51-1820-4D14-9195-75FCA6997784}</ProjectGuid>

+    <RootNamespace>glsl_apps_compile</RootNamespace>

+    <Keyword>Win32Proj</Keyword>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">compile</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">compile</TargetName>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\src\talloc;..\..\..\..\src\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include</AdditionalIncludeDirectories>

+    </ClCompile>

+    <Link>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+    <PostBuildEvent>

+      <Command>copy "$(OutDir)compile.exe" ..\..\..\..\src\glsl\apps</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\src\talloc;..\..\..\..\src\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include</AdditionalIncludeDirectories>

+    </ClCompile>

+    <Link>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+    <PostBuildEvent>

+      <Command>copy "$(OutDir)compile.exe" ..\..\..\..\src\glsl\apps</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\..\..\src\glsl\ast_expr.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ast_function.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\builtin_stubs.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\getopt.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c" />

+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c" />

+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\pp.c" />

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_lexer.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_parser.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_parser_extras.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_symbol_table.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_types.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\hir_field_selection.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_basic_block.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_clone.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_constant_expression.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_expression_flattening.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_function.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_function_can_inline.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_hierarchical_visitor.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_hv_accept.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_import_prototypes.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_print_visitor.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_reader.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_rvalue_visitor.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_set_program_inouts.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_validate.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_variable.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_variable_refcount.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\linker.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\link_functions.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\loop_controls.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\loop_unroll.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_discard.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_if_to_cond_assign.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_instructions.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_jumps.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_mat_op_to_vec.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_noise.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_texture_projection.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_variable_index_to_cond_assign.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_vector.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_cond_assign.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_swizzle.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\main.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_algebraic.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_folding.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_propagation.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_variable.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code_local.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_functions.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_discard_simplification.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_function_inlining.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_if_simplification.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_noop_swizzle.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_structure_splitting.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_swizzle_swizzle.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_tree_grafting.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\strtod.c" />

+    <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\hash_table.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\symbol_table.c" />

+    <ClCompile Include="..\..\..\..\src\talloc\talloc.c" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\..\..\src\glsl\strtod.h" />

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters
new file mode 100644
index 000000000..e0d76d931
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>

+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\..\..\src\glsl\ast_expr.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ast_function.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_lexer.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_parser.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_parser_extras.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_symbol_table.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_types.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\hir_field_selection.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_basic_block.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_clone.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_constant_expression.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_expression_flattening.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_function.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_function_can_inline.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_hierarchical_visitor.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_hv_accept.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_import_prototypes.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_print_visitor.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_reader.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_rvalue_visitor.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_set_program_inouts.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_validate.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_variable.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_variable_refcount.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\link_functions.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\linker.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\loop_controls.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\loop_unroll.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_noise.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_variable_index_to_cond_assign.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\main.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\talloc\talloc.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\hash_table.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\symbol_table.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\pp.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\getopt.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_swizzle.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_folding.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_structure_splitting.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_variable.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_algebraic.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_if_simplification.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_instructions.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code_local.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_discard_simplification.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_cond_assign.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_function_inlining.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_texture_projection.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_functions.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_vector.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\strtod.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_discard.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_mat_op_to_vec.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_tree_grafting.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_noop_swizzle.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_jumps.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_propagation.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_if_to_cond_assign.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_swizzle_swizzle.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\builtin_stubs.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\..\..\src\glsl\strtod.h">

+      <Filter>Source Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/glu/glu.vcproj b/mesalib/windows/VC8/mesa/glu/glu.vcproj
index b3b4b10d7..8cf138dc5 100644
--- a/mesalib/windows/VC8/mesa/glu/glu.vcproj
+++ b/mesalib/windows/VC8/mesa/glu/glu.vcproj
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="9,00"

 	Name="glu"

 	ProjectGUID="{2E50FDAF-430B-475B-AE6B-60B68F2875BA}"

 	RootNamespace="glu"

+	TargetFrameworkVersion="131072"

 	>

 	<Platforms>

 		<Platform

@@ -46,7 +47,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

+				InlineFunctionExpansion="2"

+				OmitFramePointers="true"

+				WholeProgramOptimization="true"

 				AdditionalIncludeDirectories="../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GLU32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE"

 				StringPooling="true"

@@ -75,6 +78,9 @@
 				AdditionalLibraryDirectories="$(TargetDir)"

 				ModuleDefinitionFile="..\..\..\..\src\glu\sgi\glu.def"

 				ProgramDatabaseFile="$(TargetDir)GLU32.pdb"

+				LinkTimeCodeGeneration="1"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -95,9 +101,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)GLU32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)GLU32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)GLU32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"

 			/>

@@ -164,6 +167,8 @@
 				ModuleDefinitionFile="..\..\..\..\src\glu\sgi\glu.def"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile="$(TargetDir)GLU32.pdb"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -184,9 +189,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)GLU32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)GLU32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)GLU32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"

 			/>

@@ -253,6 +255,8 @@
 				ModuleDefinitionFile="..\..\..\..\src\glu\sgi\glu.def"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile="$(TargetDir)GLU32.pdb"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -273,9 +277,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)GLU32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)GLU32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)GLU32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"

 			/>

@@ -312,12 +313,17 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

+				InlineFunctionExpansion="2"

+				OmitFramePointers="true"

+				WholeProgramOptimization="true"

 				AdditionalIncludeDirectories="../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GLU32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE"

 				StringPooling="true"

+				ExceptionHandling="0"

 				RuntimeLibrary="0"

+				BufferSecurityCheck="false"

 				EnableFunctionLevelLinking="true"

+				EnableEnhancedInstructionSet="2"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

 			/>

@@ -341,6 +347,9 @@
 				AdditionalLibraryDirectories="$(TargetDir)"

 				ModuleDefinitionFile="..\..\..\..\src\glu\sgi\glu.def"

 				ProgramDatabaseFile="$(TargetDir)GLU32.pdb"

+				LinkTimeCodeGeneration="1"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -361,9 +370,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)GLU32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)GLU32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)GLU32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"

 			/>

@@ -598,11 +604,11 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\glimports.h"

+				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glimports.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glimports.h"

+				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\glimports.h"

 				>

 			</File>

 			<File

@@ -698,19 +704,19 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdio.h"

+				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdio.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdio.h"

+				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdio.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdlib.h"

+				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdlib.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdlib.h"

+				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdlib.h"

 				>

 			</File>

 			<File

diff --git a/mesalib/windows/VC8/mesa/glu/glu.vcxproj b/mesalib/windows/VC8/mesa/glu/glu.vcxproj
new file mode 100644
index 000000000..768349a49
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/glu/glu.vcxproj
@@ -0,0 +1,346 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{2E50FDAF-430B-475B-AE6B-60B68F2875BA}</ProjectGuid>

+    <RootNamespace>glu</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>.\Release/glu.tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <OmitFramePointers>true</OmitFramePointers>

+      <WholeProgramOptimization>true</WholeProgramOptimization>

+      <AdditionalIncludeDirectories>../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GLU32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>

+      <OutputFile>$(OutDir)GLU32.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <ModuleDefinitionFile>..\..\..\..\src\glu\sgi\glu.def</ModuleDefinitionFile>

+      <ProgramDatabaseFile>$(TargetDir)GLU32.pdb</ProgramDatabaseFile>

+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+    </Link>

+    <PostBuildEvent>

+      <Command>if not exist ..\..\..\..\lib md ..\..\..\..\lib

+copy "$(TargetDir)GLU32.LIB" ..\..\..\..\lib

+copy "$(TargetDir)GLU32.DLL" ..\..\..\..\lib

+if exist ..\..\..\..\progs\demos copy "$(TargetDir)GLU32.DLL" ..\..\..\..\progs\demos

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>.\Debug/glu.tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GLU32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>

+      <OutputFile>$(OutDir)GLU32.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <ModuleDefinitionFile>..\..\..\..\src\glu\sgi\glu.def</ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(TargetDir)GLU32.pdb</ProgramDatabaseFile>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+    </Link>

+    <PostBuildEvent>

+      <Command>if not exist ..\..\..\..\lib md ..\..\..\..\lib

+copy "$(TargetDir)GLU32.LIB" ..\..\..\..\lib

+copy "$(TargetDir)GLU32.DLL" ..\..\..\..\lib

+if exist ..\..\..\..\progs\demos copy "$(TargetDir)GLU32.DLL" ..\..\..\..\progs\demos

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\dict.c" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libutil\error.c" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\geom.c" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libutil\glue.c" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\memalloc.c" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\mesh.c" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libutil\mipmap.c" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\normal.c" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\priorityq-heap.c">

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\priorityq.c" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libutil\project.c" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libutil\quad.c" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libutil\registry.c" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\render.c" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\sweep.c" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\tess.c" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\tessmono.c" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\arc.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\arcsorter.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\arctess.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\backend.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\basiccrveval.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\basicsurfeval.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierEval.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatch.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatchMesh.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\bin.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\bufpool.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\cachingeval.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\ccw.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\coveandtiler.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\curve.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\curvelist.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\curvesub.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\dataTransform.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\directedLine.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\displaylist.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\flist.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\flistsorter.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glcurveval.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glinterface.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glrenderer.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glsurfeval.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\hull.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\incurveeval.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\insurfeval.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\intersect.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\knotvector.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdesc.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdescv.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\maplist.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mesher.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoChain.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\monoTriangulationBackend.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mycode.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbsinterfac.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbstess.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionX.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionY.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\patch.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\patchlist.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyDBG.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyUtil.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\primitiveStream.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\quicksort.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\quilt.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\reader.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\rectBlock.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\renderhints.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleComp.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompBot.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompRight.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\slicer.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\sorter.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\splitarcs.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\subdivider.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\tobezier.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\trimline.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\trimregion.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertpool.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\uarray.cc" />

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\varray.cc" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="..\..\..\..\src\glu\sgi\glu.def" />

+    <None Include="..\..\..\..\src\glu\sgi\libtess\README" />

+    <None Include="..\..\..\..\src\glu\sgi\libtess\alg-outline" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\arc.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\arcsorter.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\arctess.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\backend.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\basiccrveval.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\basicsurfeval.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\bezierarc.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierEval.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatch.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatchMesh.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\bin.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\bufpool.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\cachingeval.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\coveandtiler.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\curve.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\curvelist.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\dataTransform.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\defines.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\definitions.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\dict-list.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\dict.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\directedLine.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\displaylist.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\displaymode.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\flist.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\flistsorter.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\geom.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glcurveval.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glimports.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\glimports.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glrenderer.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glsurfeval.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libutil\gluint.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\include\gluos.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\gridline.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\gridtrimvertex.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\gridvertex.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\hull.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\jarcloc.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\knotvector.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdesc.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\maplist.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\memalloc.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\mesh.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mesher.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoChain.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\myassert.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mymath.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mysetjmp.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdio.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdio.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdlib.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdlib.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mystring.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\normal.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbsconsts.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbstess.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionX.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionY.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\patch.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\patchlist.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyDBG.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyUtil.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\primitiveStream.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\priorityq-heap.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\priorityq-sort.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\priorityq.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\pwlarc.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\quicksort.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\quilt.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\reader.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\rectBlock.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\render.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\renderhints.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleComp.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompBot.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompRight.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\simplemath.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\slicer.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\sorter.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\subdivider.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\sweep.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\tess.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\tessmono.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\trimline.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\trimregion.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertex.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertpool.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\types.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\uarray.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\varray.h" />

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\zlassert.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\gdi\gdi.vcxproj">

+      <Project>{a1b24907-e196-4826-b6af-26723629b633}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/glu/glu.vcxproj.filters b/mesalib/windows/VC8/mesa/glu/glu.vcxproj.filters
new file mode 100644
index 000000000..b7037a8c1
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/glu/glu.vcxproj.filters
@@ -0,0 +1,604 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{c0b7213c-4b63-4ebe-9641-5e1aff0296a0}</UniqueIdentifier>

+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{c0bc62a3-686f-4c7b-94d0-1e123032c0ae}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl</Extensions>

+    </Filter>

+    <Filter Include="C++ files">

+      <UniqueIdentifier>{5f9d844f-8300-4130-947f-078dfbcbab76}</UniqueIdentifier>

+      <Extensions>.cc</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{41ddc86c-5959-4237-9452-a4a96a15d2c3}</UniqueIdentifier>

+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\dict.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libutil\error.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\geom.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libutil\glue.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\memalloc.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\mesh.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libutil\mipmap.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\normal.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\priorityq-heap.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\priorityq.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libutil\project.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libutil\quad.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libutil\registry.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\render.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\sweep.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\tess.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\tessmono.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\arc.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\arcsorter.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\arctess.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\backend.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\basiccrveval.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\basicsurfeval.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierEval.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatch.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatchMesh.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\bin.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\bufpool.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\cachingeval.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\ccw.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\coveandtiler.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\curve.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\curvelist.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\curvesub.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\dataTransform.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\directedLine.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\displaylist.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\flist.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\flistsorter.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glcurveval.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glinterface.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glrenderer.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glsurfeval.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\hull.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\incurveeval.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\insurfeval.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\intersect.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\knotvector.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdesc.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdescv.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\maplist.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mesher.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoChain.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\monoTriangulationBackend.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mycode.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbsinterfac.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbstess.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionX.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionY.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\patch.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\patchlist.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyDBG.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyUtil.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\primitiveStream.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\quicksort.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\quilt.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\reader.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\rectBlock.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\renderhints.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleComp.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompBot.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompRight.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\slicer.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\sorter.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\splitarcs.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\subdivider.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\tobezier.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\trimline.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\trimregion.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertpool.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\uarray.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\varray.cc">

+      <Filter>C++ files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="..\..\..\..\src\glu\sgi\glu.def">

+      <Filter>Source Files</Filter>

+    </None>

+    <None Include="..\..\..\..\src\glu\sgi\libtess\README">

+      <Filter>C++ files</Filter>

+    </None>

+    <None Include="..\..\..\..\src\glu\sgi\libtess\alg-outline" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\arc.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\arcsorter.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\arctess.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\backend.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\basiccrveval.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\basicsurfeval.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\bezierarc.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierEval.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatch.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatchMesh.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\bin.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\bufpool.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\cachingeval.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\coveandtiler.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\curve.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\curvelist.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\dataTransform.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\defines.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\definitions.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\dict-list.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\dict.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\directedLine.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\displaylist.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\displaymode.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\flist.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\flistsorter.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\geom.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glcurveval.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glimports.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\glimports.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glrenderer.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glsurfeval.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libutil\gluint.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\include\gluos.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\gridline.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\gridtrimvertex.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\gridvertex.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\hull.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\jarcloc.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\knotvector.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdesc.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\maplist.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\memalloc.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\mesh.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mesher.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoChain.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\myassert.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mymath.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mysetjmp.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdio.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdio.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdlib.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdlib.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mystring.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\normal.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbsconsts.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbstess.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionX.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionY.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\patch.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\patchlist.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyDBG.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyUtil.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\primitiveStream.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\priorityq-heap.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\priorityq-sort.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\priorityq.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\pwlarc.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\quicksort.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\quilt.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\reader.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\rectBlock.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\render.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\renderhints.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleComp.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompBot.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompRight.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\simplemath.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\slicer.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\sorter.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\subdivider.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\sweep.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\tess.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\tessmono.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\trimline.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\trimregion.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertex.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertpool.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\types.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\uarray.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\varray.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\zlassert.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/makefile b/mesalib/windows/VC8/mesa/makefile
new file mode 100644
index 000000000..af644143d
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/makefile
@@ -0,0 +1,54 @@
+ifdef VS2008

+MHMAKESLNFILE=mesa.sln

+BUILDCMD=vcbuild $(MHMAKESLNFILE)

+else

+MHMAKESLNFILE=mesavc10.sln

+BUILDCMD=devenv.com $(MHMAKESLNFILE) /build

+endif

+

+DEPS:=$(wildcard ..\..\..\src\mesa\swrast\*.c) \

+      $(wildcard ..\..\..\src\mesa\swrast\*.h) \

+      $(wildcard ..\..\..\src\mesa\swrast_setup\*.c) \

+      $(wildcard ..\..\..\src\mesa\swrast_setup\*.h) \

+      $(wildcard ..\..\..\src\mesa\main\*.c) \

+      $(wildcard ..\..\..\src\mesa\main\*.h) \

+      $(wildcard ..\..\..\src\mesa\shader\*.c) \

+      $(wildcard ..\..\..\src\mesa\shader\*.h) \

+      $(wildcard ..\..\..\src\mesa\shader\slang\*.c) \

+      $(wildcard ..\..\..\src\mesa\shader\slang\*.h) \

+      $(wildcard ..\..\..\src\mesa\shader\slang\library\*.c) \

+      $(wildcard ..\..\..\src\mesa\shader\slang\library\*.h) \

+      $(wildcard ..\..\..\src\mesa\glapi\*.c) \

+      $(wildcard ..\..\..\src\mesa\glapi\*.h) \

+      $(wildcard ..\..\..\src\mesa\math\*.c) \

+      $(wildcard ..\..\..\src\mesa\math\*.h) \

+      $(wildcard ..\..\..\src\mesa\tnl\*.c) \

+      $(wildcard ..\..\..\src\mesa\tnl\*.h) \

+      $(wildcard ..\..\..\src\mesa\vbo\*.c) \

+      $(wildcard ..\..\..\src\mesa\vbo\*.h) \

+      $(wildcard ..\..\..\src\glsl\cl\*.c) \

+      $(wildcard ..\..\..\src\glsl\cl\*.h) \

+      $(wildcard ..\..\..\src\glsl\pp\*.c) \

+      $(wildcard ..\..\..\src\glsl\pp\*.h) \

+      $(wildcard ..\..\..\src\glsl\apps\*.c) \

+      $(wildcard ..\..\..\src\glsl\apps\*.h) \

+      $(wildcard ..\..\..\src\mesa\drivers\dri\swrast\*.c) \

+      $(wildcard ..\..\..\src\mesa\drivers\dri\swrast\*.h) \

+      $(wildcard ..\..\..\src\mesa\drivers\dri\common\*.c) \

+      $(wildcard ..\..\..\src\mesa\drivers\dri\common\*.h) \

+      $(wildcard ..\..\..\src\mesa\drivers\common\*.c) \

+      $(wildcard ..\..\..\src\mesa\drivers\common\*.h)

+

+all: Release\swrast_dri.dll Debug\swrast_dri.dll

+

+Debug\swrast_dri.dll: $(DEPS)

+	$(BUILDCMD) "Debug|Win32" 

+

+Release\swrast_dri.dll: $(DEPS)

+	$(BUILDCMD) "Release|Win32" 

+

+clean: cleanthis

+

+cleanthis:

+	del -e Debug

+	del -e Release

diff --git a/mesalib/windows/VC8/mesa/mesa.sln b/mesalib/windows/VC8/mesa/mesa.sln
index 915e00026..494504e0f 100644
--- a/mesalib/windows/VC8/mesa/mesa.sln
+++ b/mesalib/windows/VC8/mesa/mesa.sln
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual Studio 2005

+Microsoft Visual Studio Solution File, Format Version 10.00

+# Visual C++ Express 2008

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdi", "gdi\gdi.vcproj", "{A1B24907-E196-4826-B6AF-26723629B633}"

 	ProjectSection(ProjectDependencies) = postProject

 		{2120C974-2717-4709-B44F-D6E6D0A56448} = {2120C974-2717-4709-B44F-D6E6D0A56448}

@@ -22,6 +22,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osmesa", "osmesa\osmesa.vcp
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glsl_apps_compile", "glsl_apps_compile\glsl_apps_compile.vcproj", "{98AB3D51-1820-4D14-9195-75FCA6997784}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swrast_dri", "swrast_dri\swrast_dri.vcproj", "{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}"

+	ProjectSection(ProjectDependencies) = postProject

+		{2120C974-2717-4709-B44F-D6E6D0A56448} = {2120C974-2717-4709-B44F-D6E6D0A56448}

+	EndProjectSection

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug Static CRT|Win32 = Debug Static CRT|Win32

@@ -31,21 +36,13 @@ Global
 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

 		{A1B24907-E196-4826-B6AF-26723629B633}.Debug Static CRT|Win32.ActiveCfg = Debug Static CRT|Win32

-		{A1B24907-E196-4826-B6AF-26723629B633}.Debug Static CRT|Win32.Build.0 = Debug Static CRT|Win32

 		{A1B24907-E196-4826-B6AF-26723629B633}.Debug|Win32.ActiveCfg = Debug|Win32

-		{A1B24907-E196-4826-B6AF-26723629B633}.Debug|Win32.Build.0 = Debug|Win32

 		{A1B24907-E196-4826-B6AF-26723629B633}.Release Static CRT|Win32.ActiveCfg = Release Static CRT|Win32

-		{A1B24907-E196-4826-B6AF-26723629B633}.Release Static CRT|Win32.Build.0 = Release Static CRT|Win32

 		{A1B24907-E196-4826-B6AF-26723629B633}.Release|Win32.ActiveCfg = Release|Win32

-		{A1B24907-E196-4826-B6AF-26723629B633}.Release|Win32.Build.0 = Release|Win32

 		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Debug Static CRT|Win32.ActiveCfg = Debug Static CRT|Win32

-		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Debug Static CRT|Win32.Build.0 = Debug Static CRT|Win32

 		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Debug|Win32.ActiveCfg = Debug|Win32

-		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Debug|Win32.Build.0 = Debug|Win32

 		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Release Static CRT|Win32.ActiveCfg = Release Static CRT|Win32

-		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Release Static CRT|Win32.Build.0 = Release Static CRT|Win32

 		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Release|Win32.ActiveCfg = Release|Win32

-		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Release|Win32.Build.0 = Release|Win32

 		{2120C974-2717-4709-B44F-D6E6D0A56448}.Debug Static CRT|Win32.ActiveCfg = Debug Static CRT|Win32

 		{2120C974-2717-4709-B44F-D6E6D0A56448}.Debug Static CRT|Win32.Build.0 = Debug Static CRT|Win32

 		{2120C974-2717-4709-B44F-D6E6D0A56448}.Debug|Win32.ActiveCfg = Debug|Win32

@@ -55,13 +52,17 @@ Global
 		{2120C974-2717-4709-B44F-D6E6D0A56448}.Release|Win32.ActiveCfg = Release|Win32

 		{2120C974-2717-4709-B44F-D6E6D0A56448}.Release|Win32.Build.0 = Release|Win32

 		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Debug Static CRT|Win32.ActiveCfg = Debug Static CRT|Win32

-		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Debug Static CRT|Win32.Build.0 = Debug Static CRT|Win32

 		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Debug|Win32.ActiveCfg = Debug|Win32

-		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Debug|Win32.Build.0 = Debug|Win32

 		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release Static CRT|Win32.ActiveCfg = Release Static CRT|Win32

-		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release Static CRT|Win32.Build.0 = Release Static CRT|Win32

 		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release|Win32.ActiveCfg = Release|Win32

-		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release|Win32.Build.0 = Release|Win32

+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Debug Static CRT|Win32.ActiveCfg = Debug Static CRT|Win32

+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Debug Static CRT|Win32.Build.0 = Debug Static CRT|Win32

+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Debug|Win32.ActiveCfg = Debug|Win32

+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Debug|Win32.Build.0 = Debug|Win32

+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Release Static CRT|Win32.ActiveCfg = Release Static CRT|Win32

+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Release Static CRT|Win32.Build.0 = Release Static CRT|Win32

+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Release|Win32.ActiveCfg = Release|Win32

+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Release|Win32.Build.0 = Release|Win32

 		{98AB3D51-1820-4D14-9195-75FCA6997784}.Debug Static CRT|Win32.ActiveCfg = Debug|Win32

 		{98AB3D51-1820-4D14-9195-75FCA6997784}.Debug Static CRT|Win32.Build.0 = Debug|Win32

 		{98AB3D51-1820-4D14-9195-75FCA6997784}.Debug|Win32.ActiveCfg = Debug|Win32

diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcproj
index 5a5b93a77..eb78e6c60 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcproj
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcproj
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="9,00"

 	Name="mesa"

 	ProjectGUID="{2120C974-2717-4709-B44F-D6E6D0A56448}"

 	RootNamespace="mesa"

+	TargetFrameworkVersion="131072"

 	>

 	<Platforms>

 		<Platform

@@ -46,9 +47,11 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/Zm1000 "

-				InlineFunctionExpansion="1"

+				InlineFunctionExpansion="2"

+				OmitFramePointers="true"

+				WholeProgramOptimization="true"

 				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang"

-				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_DLL;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE"

+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_DLL;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER"

 				StringPooling="true"

 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

@@ -123,7 +126,7 @@
 				AdditionalOptions="/Zm1000 "

 				Optimization="0"

 				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang"

-				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_DLL;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE"

+				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_DLL;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

 				BrowseInformation="1"

@@ -198,7 +201,7 @@
 				AdditionalOptions="/Zm1000 "

 				Optimization="0"

 				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang"

-				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE"

+				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

 				BrowseInformation="1"

@@ -271,12 +274,17 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/Zm1000 "

-				InlineFunctionExpansion="1"

+				InlineFunctionExpansion="2"

+				OmitFramePointers="true"

+				WholeProgramOptimization="true"

 				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang"

-				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE"

+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER"

 				StringPooling="true"

+				ExceptionHandling="0"

 				RuntimeLibrary="0"

+				BufferSecurityCheck="false"

 				EnableFunctionLevelLinking="true"

+				EnableEnhancedInstructionSet="2"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

@@ -519,6 +527,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\..\src\mesa\shader\hash_table.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\..\src\mesa\main\hint.c"

 				>

 			</File>

@@ -571,6 +583,42 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\..\..\..\src\mesa\shader\lex.yy.c"

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="YY_NO_UNISTD_H"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="YY_NO_UNISTD_H"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug Static CRT|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="YY_NO_UNISTD_H"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release Static CRT|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="YY_NO_UNISTD_H"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

 				RelativePath="..\..\..\..\src\mesa\main\light.c"

 				>

 			</File>

@@ -759,10 +807,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\remap.c"

-				>

-			</File>

-			<File

 				RelativePath="..\..\..\..\src\mesa\main\renderbuffer.c"

 				>

 			</File>

@@ -1051,6 +1095,14 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\..\src\mesa\shader\symbol_table.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\mesa\main\syncobj.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\..\src\mesa\main\syncobj.c"

 				>

 			</File>

diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
new file mode 100644
index 000000000..7b912523c
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
@@ -0,0 +1,336 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{2120C974-2717-4709-B44F-D6E6D0A56448}</ProjectGuid>

+    <RootNamespace>mesa</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>

+    <PreBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</PreBuildEventUseInBuild>

+    <PreLinkEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</PreLinkEventUseInBuild>

+    <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</PostBuildEventUseInBuild>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <OmitFramePointers>true</OmitFramePointers>

+      <WholeProgramOptimization>true</WholeProgramOptimization>

+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/talloc;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_DLL;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <ForcedIncludeFiles>../../../../src/mesa/main/compiler.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+    </ResourceCompile>

+    <Lib>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </Lib>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/talloc;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_LIB;_DLL;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <BrowseInformation>true</BrowseInformation>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <ForcedIncludeFiles>../../../../src/mesa/main/compiler.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+    </ResourceCompile>

+    <Lib>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </Lib>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\glsl_apps_compile\glsl_apps_compile.vcxproj">

+      <Project>{98ab3d51-1820-4d14-9195-75fca6997784}</Project>

+      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>

+      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\..\..\src\glsl\ast_expr.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ast_function.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\builtin_stubs.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c" />

+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c" />

+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\pp.c" />

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_lexer.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_parser.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_parser_extras.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_symbol_table.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_types.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\hir_field_selection.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_basic_block.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_clone.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_constant_expression.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_expression_flattening.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_function.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_function_can_inline.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_hierarchical_visitor.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_hv_accept.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_import_prototypes.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_print_visitor.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_reader.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_rvalue_visitor.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_set_program_inouts.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\ir_validate.cpp">

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+      </ForcedIncludeFiles>

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+      </ForcedIncludeFiles>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_variable.cpp">

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+      </ForcedIncludeFiles>

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+      </ForcedIncludeFiles>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_variable_refcount.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\linker.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\link_functions.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\loop_controls.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\loop_unroll.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_discard.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_if_to_cond_assign.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_instructions.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_jumps.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_mat_op_to_vec.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_noise.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_texture_projection.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_variable_index_to_cond_assign.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_vector.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_cond_assign.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_swizzle.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_algebraic.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_folding.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_propagation.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_variable.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code_local.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_functions.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_discard_simplification.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_function_inlining.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_if_simplification.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_noop_swizzle.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_structure_splitting.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_swizzle_swizzle.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\opt_tree_grafting.cpp" />

+    <ClCompile Include="..\..\..\..\src\glsl\strtod.c" />

+    <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\accum.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\api_arrayelt.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\api_exec.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\api_loopback.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\api_noop.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\api_validate.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\arbprogram.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\atifragshader.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\nvprogram.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\pack.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\pixeltransfer.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\querymatrix.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\shaderapi.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\shaderobj.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\transformfeedback.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\uniforms.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\arbprogparse.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\arrayobj.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\attrib.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\blend.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\bufferobj.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\buffers.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\clear.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\clip.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\colortab.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\condrender.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\context.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\convolve.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\cpuinfo.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\debug.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\depth.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\depthstencil.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\dlist.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\dlopen.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\drawpix.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\enable.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\enums.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\eval.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\execmem.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\extensions.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\fbobject.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\feedback.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\ffvertex_prog.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\fog.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\formats.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\framebuffer.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\get.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\getstring.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\hash.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\hash_table.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\ir_to_mesa.cpp" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\lex.yy.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\nvfragparse.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\nvvertparse.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\program.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\programopt.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\program_parse.tab.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\program_parse_extra.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_cache.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_execute.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_instruction.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_noise.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_optimize.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_parameter.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_parameter_layout.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_print.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_statevars.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_uniform.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\register_allocate.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\sampler.cpp" />

+    <ClCompile Include="..\..\..\..\src\mesa\program\symbol_table.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\hint.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\histogram.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\image.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\imports.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\light.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\lines.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\math\m_eval.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\math\m_matrix.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\math\m_translate.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\math\m_vector.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\math\m_xform.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\matrix.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\mipmap.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\mm.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\multisample.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\pixel.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\pixelstore.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\points.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\polygon.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\queryobj.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\rastpos.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\readpix.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\renderbuffer.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\scissor.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\shared.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\state.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\stencil.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\syncobj.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_context.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_draw.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_pipeline.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_rasterpos.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_fog.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_light.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_normals.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_points.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_program.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_render.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_texgen.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_texmat.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_vertex.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vertex.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vertex_generic.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vp_build.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_fxt1.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_s3tc.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texenv.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texenvprogram.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texfetch.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texformat.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texgen.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texgetimage.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\teximage.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texobj.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texparam.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texrender.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texstate.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texstore.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\varray.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_context.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_api.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_array.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_draw.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_eval.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_rebase.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_api.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_draw.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_loopback.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split_copy.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split_inplace.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\version.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\viewport.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\vtxfmt.c" />

+    <ClCompile Include="..\..\..\..\src\talloc\talloc.c" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\..\..\src\glsl\strtod.h" />

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
new file mode 100644
index 000000000..a86c99d82
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
@@ -0,0 +1,662 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{8411a2f0-9621-4bb9-9aec-30713df37794}</UniqueIdentifier>

+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{82940400-de84-4aa3-8c90-a68fc32ae059}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\..\..\src\mesa\main\api_arrayelt.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\api_exec.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\api_loopback.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\api_noop.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\api_validate.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\arrayobj.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\attrib.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\blend.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\bufferobj.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\buffers.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\clear.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\clip.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\colortab.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\condrender.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\context.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\convolve.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\cpuinfo.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\debug.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\depth.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\depthstencil.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\dlist.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\dlopen.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\drawpix.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\enable.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\enums.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\eval.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\execmem.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\extensions.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\fbobject.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\feedback.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\ffvertex_prog.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\fog.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\formats.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\framebuffer.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\get.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\getstring.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\hash.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\hint.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\histogram.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\image.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\imports.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\light.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\lines.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\math\m_eval.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\math\m_matrix.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\math\m_translate.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\math\m_vector.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\math\m_xform.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\matrix.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\mipmap.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\mm.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\multisample.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\pixel.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\pixelstore.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\points.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\polygon.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\queryobj.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\rastpos.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\readpix.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\renderbuffer.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\scissor.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\shared.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\state.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\stencil.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\syncobj.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_context.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_draw.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_pipeline.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_rasterpos.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_fog.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_light.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_normals.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_points.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_program.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_render.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_texgen.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_texmat.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_vertex.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vertex.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vertex_generic.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vp_build.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_fxt1.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_s3tc.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texenv.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texenvprogram.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texfetch.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texformat.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texgen.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texgetimage.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\teximage.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texobj.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texparam.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texrender.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texstate.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texstore.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\varray.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_context.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_api.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_array.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_draw.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_eval.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_rebase.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_api.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_draw.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_loopback.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split_copy.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split_inplace.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\version.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\viewport.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\vtxfmt.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\arbprogparse.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\arbprogram.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\atifragshader.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\symbol_table.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\programopt.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_uniform.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\program.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\program_parse_extra.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_cache.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_execute.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_instruction.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_noise.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_optimize.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_parameter.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_parameter_layout.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_print.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_statevars.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\hash_table.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\nvfragparse.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\nvvertparse.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\nvprogram.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\lex.yy.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\program_parse.tab.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\transformfeedback.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\shaderobj.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\shaderapi.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\accum.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\querymatrix.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\uniforms.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\ir_to_mesa.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\talloc\talloc.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_variable_index_to_cond_assign.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_hierarchical_visitor.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_types.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_variable.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_function.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_function_can_inline.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_rvalue_visitor.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_hv_accept.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_symbol_table.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_constant_expression.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_clone.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\linker.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_parser_extras.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_variable_refcount.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_basic_block.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\loop_controls.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_expression_flattening.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_import_prototypes.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\link_functions.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\loop_unroll.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ast_expr.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\hir_field_selection.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_lexer.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\pp.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_reader.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\glsl_parser.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_print_visitor.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_validate.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ir_set_program_inouts.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_noise.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\ast_function.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\pack.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\pixeltransfer.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\register_allocate.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_swizzle.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_folding.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_structure_splitting.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_variable.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_algebraic.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_if_simplification.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_instructions.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code_local.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_discard_simplification.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_cond_assign.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_function_inlining.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_texture_projection.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_functions.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_vector.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\strtod.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_discard.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_mat_op_to_vec.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_tree_grafting.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_noop_swizzle.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_jumps.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_propagation.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\lower_if_to_cond_assign.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_swizzle_swizzle.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\program\sampler.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\builtin_stubs.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\..\..\src\glsl\strtod.h">

+      <Filter>Source Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/mesavc10.sln b/mesalib/windows/VC8/mesa/mesavc10.sln
new file mode 100644
index 000000000..72926f1aa
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/mesavc10.sln
@@ -0,0 +1,43 @@
+Microsoft Visual Studio Solution File, Format Version 11.00

+# Visual Studio 2010

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdi", "gdi\gdi.vcxproj", "{A1B24907-E196-4826-B6AF-26723629B633}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glu", "glu\glu.vcxproj", "{2E50FDAF-430B-475B-AE6B-60B68F2875BA}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mesa", "mesa\mesa.vcxproj", "{2120C974-2717-4709-B44F-D6E6D0A56448}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osmesa", "osmesa\osmesa.vcxproj", "{8D6CD423-383B-49E7-81BC-D20C70B07DF5}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glsl_apps_compile", "glsl_apps_compile\glsl_apps_compile.vcxproj", "{98AB3D51-1820-4D14-9195-75FCA6997784}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swrast_dri", "swrast_dri\swrast_dri.vcxproj", "{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}"

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Win32 = Debug|Win32

+		Release|Win32 = Release|Win32

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{A1B24907-E196-4826-B6AF-26723629B633}.Debug|Win32.ActiveCfg = Debug|Win32

+		{A1B24907-E196-4826-B6AF-26723629B633}.Release|Win32.ActiveCfg = Release|Win32

+		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Debug|Win32.ActiveCfg = Debug|Win32

+		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Release|Win32.ActiveCfg = Release|Win32

+		{2120C974-2717-4709-B44F-D6E6D0A56448}.Debug|Win32.ActiveCfg = Debug|Win32

+		{2120C974-2717-4709-B44F-D6E6D0A56448}.Debug|Win32.Build.0 = Debug|Win32

+		{2120C974-2717-4709-B44F-D6E6D0A56448}.Release|Win32.ActiveCfg = Release|Win32

+		{2120C974-2717-4709-B44F-D6E6D0A56448}.Release|Win32.Build.0 = Release|Win32

+		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Debug|Win32.ActiveCfg = Debug|Win32

+		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release|Win32.ActiveCfg = Release|Win32

+		{98AB3D51-1820-4D14-9195-75FCA6997784}.Debug|Win32.ActiveCfg = Debug|Win32

+		{98AB3D51-1820-4D14-9195-75FCA6997784}.Debug|Win32.Build.0 = Debug|Win32

+		{98AB3D51-1820-4D14-9195-75FCA6997784}.Release|Win32.ActiveCfg = Release|Win32

+		{98AB3D51-1820-4D14-9195-75FCA6997784}.Release|Win32.Build.0 = Release|Win32

+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Debug|Win32.ActiveCfg = Debug|Win32

+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Debug|Win32.Build.0 = Debug|Win32

+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Release|Win32.ActiveCfg = Release|Win32

+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Release|Win32.Build.0 = Release|Win32

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+EndGlobal

diff --git a/mesalib/windows/VC8/mesa/osmesa/osmesa.vcproj b/mesalib/windows/VC8/mesa/osmesa/osmesa.vcproj
index 10f2dc971..df8b07387 100644
--- a/mesalib/windows/VC8/mesa/osmesa/osmesa.vcproj
+++ b/mesalib/windows/VC8/mesa/osmesa/osmesa.vcproj
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="9,00"

 	Name="osmesa"

 	ProjectGUID="{8D6CD423-383B-49E7-81BC-D20C70B07DF5}"

 	RootNamespace="osmesa"

+	TargetFrameworkVersion="131072"

 	>

 	<Platforms>

 		<Platform

@@ -78,6 +79,8 @@
 				AdditionalLibraryDirectories="$(TargetDir)"

 				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"

 				ProgramDatabaseFile="$(TargetDir)OSMESA32.pdb"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -98,9 +101,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OSMESA32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OSMESA32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)OSMESA32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"

 			/>

@@ -170,6 +170,8 @@
 				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile="$(TargetDir)OSMESA32.pdb"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -190,9 +192,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OSMESA32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OSMESA32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)OSMESA32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"

 			/>

@@ -262,6 +261,8 @@
 				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile="$(TargetDir)OSMESA32.pdb"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -282,9 +283,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OSMESA32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OSMESA32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)OSMESA32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"

 			/>

@@ -353,6 +351,8 @@
 				AdditionalLibraryDirectories="$(TargetDir)"

 				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"

 				ProgramDatabaseFile="$(TargetDir)OSMESA32.pdb"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -373,9 +373,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OSMESA32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OSMESA32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)OSMESA32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"

 			/>

diff --git a/mesalib/windows/VC8/mesa/osmesa/osmesa.vcxproj b/mesalib/windows/VC8/mesa/osmesa/osmesa.vcxproj
new file mode 100644
index 000000000..e93c4ead6
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/osmesa/osmesa.vcxproj
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{8D6CD423-383B-49E7-81BC-D20C70B07DF5}</ProjectGuid>

+    <RootNamespace>osmesa</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>.\Release/osmesa.tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/mesa/main;../../../../src/mesa/glapi;../../../../src/mesa/swrast;../../../../src/mesa/shader;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS;BUILD_GL32;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <CompileAs>Default</CompileAs>

+      <ForcedIncludeFiles>../../../../src/mesa/main/compiler.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>gdi32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)OSMESA32.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <ModuleDefinitionFile>..\..\..\..\src\mesa\drivers\osmesa\osmesa.def</ModuleDefinitionFile>

+      <ProgramDatabaseFile>$(TargetDir)OSMESA32.pdb</ProgramDatabaseFile>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+    </Link>

+    <PostBuildEvent>

+      <Command>if not exist ..\..\..\..\lib md ..\..\..\..\lib

+copy "$(TargetDir)OSMESA32.LIB" ..\..\..\..\lib

+copy "$(TargetDir)OSMESA32.DLL" ..\..\..\..\lib

+if exist ..\..\..\..\progs\demos copy "$(TargetDir)OSMESA32.DLL" ..\..\..\..\progs\demos

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>.\Debug/osmesa.tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/mesa/main;../../../../src/mesa/glapi;../../../../src/mesa/swrast;../../../../src/mesa/shader;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS;BUILD_GL32;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CompileAs>Default</CompileAs>

+      <ForcedIncludeFiles>../../../../src/mesa/main/compiler.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>gdi32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)OSMESA32.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <ModuleDefinitionFile>..\..\..\..\src\mesa\drivers\osmesa\osmesa.def</ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(TargetDir)OSMESA32.pdb</ProgramDatabaseFile>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+    </Link>

+    <PostBuildEvent>

+      <Command>if not exist ..\..\..\..\lib md ..\..\..\..\lib

+copy "$(TargetDir)OSMESA32.LIB" ..\..\..\..\lib

+copy "$(TargetDir)OSMESA32.DLL" ..\..\..\..\lib

+if exist ..\..\..\..\progs\demos copy "$(TargetDir)OSMESA32.DLL" ..\..\..\..\progs\demos

+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\osmesa\osmesa.c" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\gdi\gdi.vcxproj">

+      <Project>{a1b24907-e196-4826-b6af-26723629b633}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/osmesa/osmesa.vcxproj.filters b/mesalib/windows/VC8/mesa/osmesa/osmesa.vcxproj.filters
new file mode 100644
index 000000000..1b53f1730
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/osmesa/osmesa.vcxproj.filters
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{d0880fd4-74b8-4c4c-9ff9-c1a197cd1fe1}</UniqueIdentifier>

+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{b8bba57e-2653-461f-98f4-bbf4099b59ff}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{7d6a40ea-8891-472e-9b6a-8c8d130ed2eb}</UniqueIdentifier>

+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\osmesa\osmesa.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def">

+      <Filter>Source Files</Filter>

+    </None>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcproj b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcproj
new file mode 100644
index 000000000..d4086f118
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcproj
@@ -0,0 +1,434 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="9,00"

+	Name="swrast_dri"

+	ProjectGUID="{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}"

+	RootNamespace="swrast_dri"

+	TargetFrameworkVersion="131072"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Debug/swrast_dri.tlb"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="../../../../include;../../../../src/mesa/drivers/dri/common;../../../../src/mesa"

+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;SWRAST_DRI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN;IN_DRI_DRIVER;INSERVER"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				BrowseInformation="1"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386"

+				AdditionalDependencies="gdi32.lib user32.lib vcxsrv_dbg.lib"

+				OutputFile="$(OutDir)\swrast_dri.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="&quot;$(TargetDir)&quot;;&quot;..\..\..\..\..\xorg-server\obj\servdebug&quot;"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(TargetDir)swrast_dri.pdb"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/swrast_dri.tlb"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				InlineFunctionExpansion="2"

+				OmitFramePointers="true"

+				WholeProgramOptimization="true"

+				AdditionalIncludeDirectories="../../../../include;../../../../src/mesa/drivers/dri/common;../../../../src/mesa"

+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;SWRAST_DRI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN;IN_DRI_DRIVER;INSERVER"

+				StringPooling="true"

+				ExceptionHandling="0"

+				RuntimeLibrary="2"

+				BufferSecurityCheck="false"

+				EnableFunctionLevelLinking="true"

+				EnableEnhancedInstructionSet="2"

+				PrecompiledHeaderFile=".\Release/swrast_dri.pch"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386"

+				AdditionalDependencies="gdi32.lib user32.lib vcxsrv.lib"

+				OutputFile="$(OutDir)\swrast_dri.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="$(TargetDir);&quot;..\..\..\..\..\xorg-server\obj\servrelease&quot;"

+				ProgramDatabaseFile="$(TargetDir)swrast_dri.pdb"

+				LinkTimeCodeGeneration="1"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug Static CRT|Win32"

+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Debug/swrast_dri.tlb"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="../../../../include;../../../../src/mesa/drivers/dri/common;../../../../src/mesa"

+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;SWRAST_DRI_EXPORTS;BUILD_GL32;MESA_MINWARN;IN_DRI_DRIVER;INSERVER"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				BrowseInformation="1"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386"

+				AdditionalDependencies="gdi32.lib user32.lib vcxsrv_dbg.lib"

+				OutputFile="$(OutDir)\swrast_dri.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="$(TargetDir);&quot;..\..\..\..\..\xorg-server\obj\servdebug&quot;"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(TargetDir)swrast_dri.pdb"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Static CRT|Win32"

+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/swrast_dri.tlb"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				InlineFunctionExpansion="2"

+				OmitFramePointers="true"

+				WholeProgramOptimization="true"

+				AdditionalIncludeDirectories="../../../../include;../../../../src/mesa/drivers/dri/common;../../../../src/mesa"

+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;SWRAST_DRI_EXPORTS;BUILD_GL32;MESA_MINWARN;IN_DRI_DRIVER;INSERVER"

+				StringPooling="true"

+				ExceptionHandling="0"

+				RuntimeLibrary="0"

+				BufferSecurityCheck="false"

+				EnableFunctionLevelLinking="true"

+				EnableEnhancedInstructionSet="2"

+				PrecompiledHeaderFile=".\Release/swrast_dri.pch"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386"

+				AdditionalDependencies="gdi32.lib user32.lib vcxsrv.lib"

+				OutputFile="$(OutDir)\swrast_dri.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="$(TargetDir);&quot;..\..\..\..\..\xorg-server\obj\servrelease&quot;"

+				ProgramDatabaseFile="$(TargetDir)swrast_dri.pdb"

+				LinkTimeCodeGeneration="1"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+			>

+			<File

+				RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\mesa\drivers\common\meta.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\mesa\main\remap.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\mesa\drivers\dri\swrast\swrast.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\mesa\drivers\dri\swrast\swrast_priv.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\mesa\drivers\dri\swrast\swrast_span.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\mesa\drivers\dri\common\utils.c"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl"

+			>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+			>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj
new file mode 100644
index 000000000..40a1fd780
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}</ProjectGuid>

+    <RootNamespace>swrast_dri</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>.\Debug/swrast_dri.tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/talloc;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../src/mesa/drivers/dri/common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_DLL;SWRAST_DRI_EXPORTS;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <BrowseInformation>true</BrowseInformation>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CompileAs>Default</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>gdi32.lib;user32.lib;vcxsrv_dbg.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)swrast_dri.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <AdditionalLibraryDirectories>$(TargetDir);..\..\..\..\..\xorg-server\obj\servdebug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(TargetDir)swrast_dri.pdb</ProgramDatabaseFile>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>.\Release/swrast_dri.tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <OmitFramePointers>true</OmitFramePointers>

+      <WholeProgramOptimization>true</WholeProgramOptimization>

+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/talloc;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../src/mesa/drivers/dri/common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_DLL;SWRAST_DRI_EXPORTS;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>

+      <PrecompiledHeaderOutputFile>.\Release/swrast_dri.pch</PrecompiledHeaderOutputFile>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <CompileAs>Default</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>gdi32.lib;user32.lib;vcxsrv.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)swrast_dri.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <AdditionalLibraryDirectories>$(TargetDir);..\..\..\..\..\xorg-server\obj\servrelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <ProgramDatabaseFile>$(TargetDir)swrast_dri.pdb</ProgramDatabaseFile>

+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\common\driverfuncs.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\common\meta.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\common\drisw_util.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\swrast\swrast.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\swrast\swrast_span.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\common\utils.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_aaline.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_aatriangle.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_accum.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_alpha.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_atifragshader.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_bitmap.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_blend.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_blit.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_clear.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_context.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_copypix.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_depth.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_drawpix.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_feedback.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_fog.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_fragprog.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_lines.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_logic.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_masking.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_points.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_readpix.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_span.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_stencil.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_texcombine.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_texfilter.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_triangle.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_zoom.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast_setup\ss_context.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\swrast_setup\ss_triangle.c" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\..\..\src\mesa\drivers\dri\swrast\swrast_priv.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\mesa\mesa.vcxproj">

+      <Project>{2120c974-2717-4709-b44f-d6e6d0a56448}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj.filters b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj.filters
new file mode 100644
index 000000000..375cfd711
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj.filters
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{3f55ce52-2780-4f28-bb1f-06759ea15ba4}</UniqueIdentifier>

+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{b64ef3e4-df7d-40b7-8ecd-4805cbbdc8b8}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{aaf2266b-a56e-474d-926c-d8a91f25992f}</UniqueIdentifier>

+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\common\driverfuncs.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\common\meta.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\swrast\swrast.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\swrast\swrast_span.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\common\utils.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\common\drisw_util.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast_setup\ss_context.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_context.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_lines.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_bitmap.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_accum.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_clear.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_copypix.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_drawpix.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_readpix.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_zoom.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast_setup\ss_triangle.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_masking.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_aaline.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_points.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_feedback.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_triangle.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_depth.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_texfilter.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_aatriangle.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_alpha.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_atifragshader.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_blend.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_blit.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_fog.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_fragprog.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_logic.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_span.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_stencil.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_texcombine.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\..\..\src\mesa\drivers\dri\swrast\swrast_priv.h">

+      <Filter>Source Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+</Project>
\ No newline at end of file