14 files changed, 2052 insertions, 1767 deletions

diff --git a/mesalib/windows/VC8/mesa/gdi/gdi.vcproj b/mesalib/windows/VC8/mesa/gdi/gdi.vcproj
deleted file mode 100644
index 220923f90..000000000
--- a/mesalib/windows/VC8/mesa/gdi/gdi.vcproj
+++ /dev/null
@@ -1,445 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="gdi"

-	ProjectGUID="{A1B24907-E196-4826-B6AF-26723629B633}"

-	RootNamespace="gdi"

-	>

-	<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/gdi.tlb"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"

-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN"

-				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"

-				OutputFile="$(OutDir)\OPENGL32.dll"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TargetDir)"

-				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(TargetDir)OPENGL32.pdb"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				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;"

-			/>

-		</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/gdi.tlb"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				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"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile=".\Release/gdi.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"

-				OutputFile="$(OutDir)\OPENGL32.dll"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TargetDir)"

-				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"

-				ProgramDatabaseFile="$(TargetDir)OPENGL32.pdb"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				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;"

-			/>

-		</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/gdi.tlb"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"

-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;BUILD_GL32;MESA_MINWARN"

-				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"

-				OutputFile="$(OutDir)\OPENGL32.dll"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TargetDir)"

-				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(TargetDir)OPENGL32.pdb"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				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;"

-			/>

-		</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/gdi.tlb"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				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"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile=".\Release/gdi.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"

-				OutputFile="$(OutDir)\OPENGL32.dll"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TargetDir)"

-				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"

-				ProgramDatabaseFile="$(TargetDir)OPENGL32.pdb"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				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;"

-			/>

-		</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\windows\gdi\mesa.def"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\mesa\drivers\common\meta.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wgl.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wmesa.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl"

-			>

-			<File

-				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\colors.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\mesa\drivers\common\meta.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\include\GL\wmesa.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wmesadef.h"

-				>

-			</File>

-		</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/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..c34f08e20
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
@@ -0,0 +1,189 @@
+<?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\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include</AdditionalIncludeDirectories>

+    </ClCompile>

+    <Link>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </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\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>

+  </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_copy_propagation_elements.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\ralloc.c" />

+    <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" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\..\..\src\glsl\strtod.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <CustomBuild Include="..\..\..\..\src\glsl\glsl_lexer.ll">

+      <FileType>Document</FileType>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\doflexbison.bat</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\glsl_lexer.cpp;..\..\..\..\src\glsl\glcpp\glcpp-lex.c;..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h</Outputs>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\doflexbison.bat</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\glsl_lexer.cpp;..\..\..\..\src\glsl\glcpp\glcpp-lex.c;..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h</Outputs>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\glsl_parser.yy;%(AdditionalInputs)</AdditionalInputs>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\glsl_parser.yy;%(AdditionalInputs)</AdditionalInputs>

+    </CustomBuild>

+    <None Include="..\..\..\..\src\glsl\glsl_parser.yy">

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\dobison.bat</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h</Outputs>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\dobison.bat</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h</Outputs>

+      <FileType>Document</FileType>

+    </None>

+  </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..57c32b876
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters
@@ -0,0 +1,247 @@
+<?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\ralloc.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp">

+      <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>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation_elements.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\..\..\src\glsl\strtod.h">

+      <Filter>Source Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <CustomBuild Include="..\..\..\..\src\glsl\glsl_lexer.ll">

+      <Filter>Source Files</Filter>

+    </CustomBuild>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="..\..\..\..\src\glsl\glsl_parser.yy">

+      <Filter>Source Files</Filter>

+    </None>

+  </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
deleted file mode 100644
index b3b4b10d7..000000000
--- a/mesalib/windows/VC8/mesa/glu/glu.vcproj
+++ /dev/null
@@ -1,1202 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="glu"

-	ProjectGUID="{2E50FDAF-430B-475B-AE6B-60B68F2875BA}"

-	RootNamespace="glu"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<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/glu.tlb"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				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"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalOptions="/MACHINE:I386"

-				OutputFile="$(OutDir)\GLU32.dll"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TargetDir)"

-				ModuleDefinitionFile="..\..\..\..\src\glu\sgi\glu.def"

-				ProgramDatabaseFile="$(TargetDir)GLU32.pdb"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				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;"

-			/>

-		</Configuration>

-		<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/glu.tlb"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GLU32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalOptions="/MACHINE:I386"

-				OutputFile="$(OutDir)\GLU32.dll"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TargetDir)"

-				ModuleDefinitionFile="..\..\..\..\src\glu\sgi\glu.def"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(TargetDir)GLU32.pdb"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				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;"

-			/>

-		</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/glu.tlb"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GLU32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalOptions="/MACHINE:I386"

-				OutputFile="$(OutDir)\GLU32.dll"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TargetDir)"

-				ModuleDefinitionFile="..\..\..\..\src\glu\sgi\glu.def"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(TargetDir)GLU32.pdb"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				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;"

-			/>

-		</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/glu.tlb"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				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"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalOptions="/MACHINE:I386"

-				OutputFile="$(OutDir)\GLU32.dll"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TargetDir)"

-				ModuleDefinitionFile="..\..\..\..\src\glu\sgi\glu.def"

-				ProgramDatabaseFile="$(TargetDir)GLU32.pdb"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				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;"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-			>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\dict.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libutil\error.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\geom.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\glu.def"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libutil\glue.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\memalloc.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\mesh.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libutil\mipmap.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\normal.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq-heap.c"

-				>

-				<FileConfiguration

-					Name="Release|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Static CRT|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Static CRT|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libutil\project.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libutil\quad.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libutil\registry.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\render.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\sweep.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\tess.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\tessmono.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl"

-			>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arc.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arcsorter.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arctess.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\backend.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\basiccrveval.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\basicsurfeval.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bezierarc.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierEval.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatch.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatchMesh.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bin.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bufpool.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\cachingeval.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\coveandtiler.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curve.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curvelist.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\dataTransform.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\defines.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\definitions.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\dict-list.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\dict.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\directedLine.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\displaylist.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\displaymode.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\flist.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\flistsorter.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\geom.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glcurveval.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\glimports.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glimports.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glrenderer.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glsurfeval.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libutil\gluint.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\include\gluos.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\gridline.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\gridtrimvertex.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\gridvertex.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\hull.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\jarcloc.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\knotvector.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdesc.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\maplist.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\memalloc.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\mesh.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mesher.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoChain.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\myassert.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mymath.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mysetjmp.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdio.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdio.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdlib.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdlib.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mystring.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\normal.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbsconsts.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbstess.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionX.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionY.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\patch.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\patchlist.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyDBG.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyUtil.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\primitiveStream.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq-heap.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq-sort.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\pwlarc.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\quicksort.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\quilt.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\reader.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\rectBlock.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\render.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\renderhints.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleComp.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompBot.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompRight.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\simplemath.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\slicer.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\sorter.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\subdivider.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\sweep.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\tess.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\tessmono.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimline.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimregion.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertex.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertpool.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\types.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\uarray.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\varray.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\zlassert.h"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="C++ files"

-			Filter=".cc"

-			>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arc.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arcsorter.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arctess.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\backend.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\basiccrveval.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\basicsurfeval.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierEval.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatch.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatchMesh.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bin.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bufpool.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\cachingeval.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\ccw.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\coveandtiler.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curve.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curvelist.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curvesub.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\dataTransform.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\directedLine.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\displaylist.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\flist.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\flistsorter.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glcurveval.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glinterface.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glrenderer.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glsurfeval.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\hull.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\incurveeval.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\insurfeval.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\intersect.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\knotvector.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdesc.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdescv.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\maplist.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mesher.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoChain.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monoTriangulationBackend.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mycode.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbsinterfac.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbstess.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionX.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionY.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\patch.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\patchlist.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyDBG.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyUtil.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\primitiveStream.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\quicksort.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\quilt.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\reader.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libtess\README"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\rectBlock.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\renderhints.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleComp.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompBot.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompRight.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\slicer.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\sorter.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\splitarcs.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\subdivider.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\tobezier.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimline.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimregion.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertpool.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\uarray.cc"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\varray.cc"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-			>

-		</Filter>

-		<File

-			RelativePath="..\..\..\..\src\glu\sgi\libtess\alg-outline"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/mesalib/windows/VC8/mesa/makefile b/mesalib/windows/VC8/mesa/makefile
new file mode 100644
index 000000000..727065a40
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/makefile
@@ -0,0 +1,58 @@
+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\math\*.c) \

+      $(wildcard ..\..\..\src\mesa\math\*.h) \

+      $(wildcard ..\..\..\src\mesa\program\*.c) \

+      $(wildcard ..\..\..\src\mesa\program\*.cpp) \

+      $(wildcard ..\..\..\src\mesa\program\*.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\glcpp\*.c) \

+      $(wildcard ..\..\..\src\glsl\glcpp\*.h) \

+      $(wildcard ..\..\..\src\glsl\*.c) \

+      $(wildcard ..\..\..\src\glsl\*.h) \

+      $(wildcard ..\..\..\src\glsl\*.cpp) \

+      $(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..9d232353b 100644
--- a/mesalib/windows/VC8/mesa/mesa.sln
+++ b/mesalib/windows/VC8/mesa/mesa.sln
@@ -1,27 +1,17 @@
-Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual Studio 2005

-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}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glu", "glu\glu.vcproj", "{2E50FDAF-430B-475B-AE6B-60B68F2875BA}"

-	ProjectSection(ProjectDependencies) = postProject

-		{A1B24907-E196-4826-B6AF-26723629B633} = {A1B24907-E196-4826-B6AF-26723629B633}

-	EndProjectSection

-EndProject

+Microsoft Visual Studio Solution File, Format Version 10.00

+# Visual C++ Express 2008

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mesa", "mesa\mesa.vcproj", "{2120C974-2717-4709-B44F-D6E6D0A56448}"

 	ProjectSection(ProjectDependencies) = postProject

 		{98AB3D51-1820-4D14-9195-75FCA6997784} = {98AB3D51-1820-4D14-9195-75FCA6997784}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osmesa", "osmesa\osmesa.vcproj", "{8D6CD423-383B-49E7-81BC-D20C70B07DF5}"

+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

-		{A1B24907-E196-4826-B6AF-26723629B633} = {A1B24907-E196-4826-B6AF-26723629B633}

+		{2120C974-2717-4709-B44F-D6E6D0A56448} = {2120C974-2717-4709-B44F-D6E6D0A56448}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glsl_apps_compile", "glsl_apps_compile\glsl_apps_compile.vcproj", "{98AB3D51-1820-4D14-9195-75FCA6997784}"

-EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug Static CRT|Win32 = Debug Static CRT|Win32

@@ -31,21 +21,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 +37,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..136d45652
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
@@ -0,0 +1,358 @@
+<?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/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/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_copy_propagation_elements.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\ralloc.c" />

+    <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\ff_fragment_shader.cpp" />

+    <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\texturebarrier.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\pbo.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_rgtc.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_s3tc.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texenv.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" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\..\..\src\glsl\strtod.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <CustomBuild Include="..\..\..\..\src\mesa\program\program_lexer.l">

+      <FileType>Document</FileType>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\program\doflexbison.bat</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\program\lex.yy.c;..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs)</Outputs>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\program\doflexbison.bat</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\program\lex.yy.c;..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs)</Outputs>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\program\program_parse.y;%(AdditionalInputs)</AdditionalInputs>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\program\program_parse.y;%(AdditionalInputs)</AdditionalInputs>

+    </CustomBuild>

+    <None Include="..\..\..\..\src\mesa\program\program_parse.y">

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\program\dobison.bat</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs)</Outputs>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\program\dobison.bat</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs)</Outputs>

+      <FileType>Document</FileType>

+    </None>

+  </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..48e05317c
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
@@ -0,0 +1,684 @@
+<?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\ff_fragment_shader.cpp">

+      <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\texturebarrier.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\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\glsl\ralloc.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>

+    <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation_elements.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\pbo.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_rgtc.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\..\..\src\glsl\strtod.h">

+      <Filter>Source Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <CustomBuild Include="..\..\..\..\src\mesa\program\program_lexer.l">

+      <Filter>Source Files</Filter>

+    </CustomBuild>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="..\..\..\..\src\mesa\program\program_parse.y">

+      <Filter>Source Files</Filter>

+    </None>

+  </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..92fcf6f6d
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/mesavc10.sln
@@ -0,0 +1,31 @@
+Microsoft Visual Studio Solution File, Format Version 11.00

+# Visual Studio 2010

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mesa", "mesa\mesa.vcxproj", "{2120C974-2717-4709-B44F-D6E6D0A56448}"

+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

+		{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

+		{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/swrast_dri/swrast_dri.vcproj
index 10f2dc971..d4086f118 100644
--- a/mesalib/windows/VC8/mesa/osmesa/osmesa.vcproj
+++ b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcproj
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

-	Name="osmesa"

-	ProjectGUID="{8D6CD423-383B-49E7-81BC-D20C70B07DF5}"

-	RootNamespace="osmesa"

+	Version="9,00"

+	Name="swrast_dri"

+	ProjectGUID="{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}"

+	RootNamespace="swrast_dri"

+	TargetFrameworkVersion="131072"

 	>

 	<Platforms>

 		<Platform

@@ -15,7 +16,7 @@
 	</ToolFiles>

 	<Configurations>

 		<Configuration

-			Name="Release|Win32"

+			Name="Debug|Win32"

 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

 			IntermediateDirectory="$(ConfigurationName)"

 			ConfigurationType="2"

@@ -38,31 +39,31 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				PreprocessorDefinitions="NDEBUG"

+				PreprocessorDefinitions="_DEBUG"

 				MkTypLibCompatible="true"

 				SuppressStartupBanner="true"

 				TargetEnvironment="1"

-				TypeLibraryName=".\Release/osmesa.tlb"

+				TypeLibraryName=".\Debug/swrast_dri.tlb"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS;BUILD_GL32"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

+				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"

-				ForcedIncludeFiles="../../../../src/mesa/main/compiler.h"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

+				PreprocessorDefinitions="_DEBUG"

 				Culture="1033"

 			/>

 			<Tool

@@ -71,13 +72,15 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalOptions="/MACHINE:I386"

-				AdditionalDependencies="gdi32.lib user32.lib"

-				OutputFile="$(OutDir)\OSMESA32.dll"

+				AdditionalDependencies="gdi32.lib user32.lib vcxsrv_dbg.lib"

+				OutputFile="$(OutDir)\swrast_dri.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TargetDir)"

-				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"

-				ProgramDatabaseFile="$(TargetDir)OSMESA32.pdb"

+				AdditionalLibraryDirectories="&quot;$(TargetDir)&quot;;&quot;..\..\..\..\..\xorg-server\obj\servdebug&quot;"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(TargetDir)swrast_dri.pdb"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -98,15 +101,11 @@
 				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;"

 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|Win32"

+			Name="Release|Win32"

 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

 			IntermediateDirectory="$(ConfigurationName)"

 			ConfigurationType="2"

@@ -129,31 +128,36 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				PreprocessorDefinitions="_DEBUG"

+				PreprocessorDefinitions="NDEBUG"

 				MkTypLibCompatible="true"

 				SuppressStartupBanner="true"

 				TargetEnvironment="1"

-				TypeLibraryName=".\Debug/osmesa.tlb"

+				TypeLibraryName=".\Release/swrast_dri.tlb"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS;BUILD_GL32"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

+				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"

-				DebugInformationFormat="3"

 				CompileAs="0"

-				ForcedIncludeFiles="../../../../src/mesa/main/compiler.h"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

+				PreprocessorDefinitions="NDEBUG"

 				Culture="1033"

 			/>

 			<Tool

@@ -162,14 +166,15 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalOptions="/MACHINE:I386"

-				AdditionalDependencies="gdi32.lib user32.lib"

-				OutputFile="$(OutDir)\OSMESA32.dll"

+				AdditionalDependencies="gdi32.lib user32.lib vcxsrv.lib"

+				OutputFile="$(OutDir)\swrast_dri.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TargetDir)"

-				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(TargetDir)OSMESA32.pdb"

+				AdditionalLibraryDirectories="$(TargetDir);&quot;..\..\..\..\..\xorg-server\obj\servrelease&quot;"

+				ProgramDatabaseFile="$(TargetDir)swrast_dri.pdb"

+				LinkTimeCodeGeneration="1"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -190,11 +195,7 @@
 				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;"

 			/>

 		</Configuration>

 		<Configuration

@@ -225,20 +226,20 @@
 				MkTypLibCompatible="true"

 				SuppressStartupBanner="true"

 				TargetEnvironment="1"

-				TypeLibraryName=".\Debug/osmesa.tlb"

+				TypeLibraryName=".\Debug/swrast_dri.tlb"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS;BUILD_GL32"

+				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"

-				ForcedIncludeFiles="../../../../src/mesa/main/compiler.h"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -254,14 +255,15 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalOptions="/MACHINE:I386"

-				AdditionalDependencies="gdi32.lib user32.lib"

-				OutputFile="$(OutDir)\OSMESA32.dll"

+				AdditionalDependencies="gdi32.lib user32.lib vcxsrv_dbg.lib"

+				OutputFile="$(OutDir)\swrast_dri.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TargetDir)"

-				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"

+				AdditionalLibraryDirectories="$(TargetDir);&quot;..\..\..\..\..\xorg-server\obj\servdebug&quot;"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(TargetDir)OSMESA32.pdb"

+				ProgramDatabaseFile="$(TargetDir)swrast_dri.pdb"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -282,11 +284,7 @@
 				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;"

 			/>

 		</Configuration>

 		<Configuration

@@ -317,20 +315,25 @@
 				MkTypLibCompatible="true"

 				SuppressStartupBanner="true"

 				TargetEnvironment="1"

-				TypeLibraryName=".\Release/osmesa.tlb"

+				TypeLibraryName=".\Release/swrast_dri.tlb"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS;BUILD_GL32"

+				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"

-				ForcedIncludeFiles="../../../../src/mesa/main/compiler.h"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -346,13 +349,15 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalOptions="/MACHINE:I386"

-				AdditionalDependencies="gdi32.lib user32.lib"

-				OutputFile="$(OutDir)\OSMESA32.dll"

+				AdditionalDependencies="gdi32.lib user32.lib vcxsrv.lib"

+				OutputFile="$(OutDir)\swrast_dri.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TargetDir)"

-				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"

-				ProgramDatabaseFile="$(TargetDir)OSMESA32.pdb"

+				AdditionalLibraryDirectories="$(TargetDir);&quot;..\..\..\..\..\xorg-server\obj\servrelease&quot;"

+				ProgramDatabaseFile="$(TargetDir)swrast_dri.pdb"

+				LinkTimeCodeGeneration="1"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -373,11 +378,7 @@
 				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;"

 			/>

 		</Configuration>

 	</Configurations>

@@ -389,11 +390,31 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 			>

 			<File

-				RelativePath="..\..\..\..\src\mesa\drivers\osmesa\osmesa.c"

+				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\osmesa\osmesa.def"

+				RelativePath="..\..\..\..\src\mesa\drivers\dri\common\utils.c"

 				>

 			</File>

 		</Filter>

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..16e22f71c
--- /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/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/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