11 files changed, 668 insertions, 1994 deletions
diff --git a/mesalib/windows/VC8/mesa/gdi/gdi.vcxproj b/mesalib/windows/VC8/mesa/gdi/gdi.vcxproj
index 43ba76377..71c7fc78c 100644
--- a/mesalib/windows/VC8/mesa/gdi/gdi.vcxproj
+++ b/mesalib/windows/VC8/mesa/gdi/gdi.vcxproj
@@ -1,18 +1,10 @@
 <?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 Static CRT|Win32">
-      <Configuration>Debug Static CRT</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Static CRT|Win32">
-      <Configuration>Release Static CRT</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -23,16 +15,6 @@
     <RootNamespace>gdi</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
@@ -46,14 +28,6 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|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 Static CRT|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" />
@@ -71,12 +45,6 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>
@@ -170,102 +138,6 @@ if exist ..\..\..\..\progs\demos copy "$(TargetDir)mesaopengl32.dll" ..\..\..\..
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Debug/gdi.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/mesa/main;../../../../src/mesa/glapi;../../../../src/mesa/swrast;../../../../src/mesa/shader;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;BUILD_GL32;MESA_MINWARN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>gdi32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)mesaopengl32.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)mesaopengl32.pdb</ProgramDatabaseFile>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <PostBuildEvent>
-      <Command>if not exist ..\..\..\..\lib md ..\..\..\..\lib
-copy "$(TargetDir)mesaopengl32.lib" ..\..\..\..\lib
-copy "$(TargetDir)mesaopengl32.dll" ..\..\..\..\lib
-if exist ..\..\..\..\progs\demos copy "$(TargetDir)mesaopengl32.dll" ..\..\..\..\progs\demos
-</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Release/gdi.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../main;../../../../include;../../../../src/mesa;../../../../src/mesa/main;../../../../src/mesa/glapi;../../../../src/mesa/swrast;../../../../src/mesa/shader;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;BUILD_GL32;MESA_MINWARN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <PrecompiledHeaderOutputFile>.\Release/gdi.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>gdi32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)mesaopengl32.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(TargetDir)mesaopengl32.pdb</ProgramDatabaseFile>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <PostBuildEvent>
-      <Command>if not exist ..\..\..\..\lib md ..\..\..\..\lib
-copy "$(TargetDir)mesaopengl32.lib" ..\..\..\..\lib
-copy "$(TargetDir)mesaopengl32.dll" ..\..\..\..\lib
-if exist ..\..\..\..\progs\demos copy "$(TargetDir)mesaopengl32.dll" ..\..\..\..\progs\demos
-</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\src\mesa\drivers\common\driverfuncs.c" />
     <ClCompile Include="..\..\..\..\src\mesa\drivers\common\meta.c" />
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
index cfd1197e9..e27516ab9 100644
--- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
+++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
@@ -18,12 +18,12 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -49,14 +49,15 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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>EditAndContinue</DebugInformationFormat>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\src\talloc;..\..\..\..\src\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -72,12 +73,13 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\src\talloc;..\..\..\..\src\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -94,35 +96,74 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\glsl\apps\compile.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\cl\sl_cl_parse.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_context.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_define.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_dict.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_error.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_expression.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_extension.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_if.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_line.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_macro.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_pragma.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_process.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_purify.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_token.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_token_util.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_version.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_token.h" />
-    <ClInclude Include="..\..\..\..\src\glsl\cl\sl_cl_parse.h" />
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_context.h" />
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_dict.h" />
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_expression.h" />
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_macro.h" />
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_process.h" />
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_public.h" />
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_purify.h" />
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_token_util.h" />
+    <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_function.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_algebraic.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_constant_folding.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_constant_propagation.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_constant_variable.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_copy_propagation.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_dead_code.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_dead_code_local.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_dead_functions.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_div_to_mul_rcp.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_explog_to_explog2.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_function_inlining.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_hierarchical_visitor.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_hv_accept.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_if_simplification.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_if_to_cond_assign.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_import_prototypes.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_lower_jumps.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_mat_op_to_vec.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_mod_to_fract.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_noop_swizzle.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_structure_splitting.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_sub_to_add_neg.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_swizzle_swizzle.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_tree_grafting.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\ir_vec_index_to_cond_assign.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_vec_index_to_swizzle.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_noise.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\lower_variable_index_to_cond_assign.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\main.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp" />
+    <ClCompile Include="..\..\..\..\src\mesa\program\hash_table.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\program\symbol_table.c" />
+    <ClCompile Include="..\..\..\..\src\talloc\talloc.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
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
index 4ad681d65..5f9719d38 100644
--- 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
@@ -15,88 +15,209 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\glsl\apps\compile.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ast_expr.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\cl\sl_cl_parse.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ast_function.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_context.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_define.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_dict.c">
+    <ClCompile Include="..\..\..\..\src\glsl\builtin_function.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_error.c">
+    <ClCompile Include="..\..\..\..\src\glsl\glsl_lexer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_expression.c">
+    <ClCompile Include="..\..\..\..\src\glsl\glsl_parser.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_extension.c">
+    <ClCompile Include="..\..\..\..\src\glsl\glsl_parser_extras.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_if.c">
+    <ClCompile Include="..\..\..\..\src\glsl\glsl_symbol_table.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_line.c">
+    <ClCompile Include="..\..\..\..\src\glsl\glsl_types.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_macro.c">
+    <ClCompile Include="..\..\..\..\src\glsl\hir_field_selection.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_pragma.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_process.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_algebraic.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_purify.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_basic_block.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_token.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_clone.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_token_util.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_constant_expression.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_version.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_constant_folding.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\ir_constant_propagation.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\ir_constant_variable.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\ir_copy_propagation.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\ir_dead_code.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\ir_dead_code_local.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\ir_dead_functions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\ir_div_to_mul_rcp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\ir_explog_to_explog2.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_function_inlining.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_if_simplification.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\ir_if_to_cond_assign.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\ir_import_prototypes.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\ir_lower_jumps.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\ir_mat_op_to_vec.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\ir_mod_to_fract.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\ir_noop_swizzle.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_structure_splitting.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\ir_sub_to_add_neg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\ir_swizzle_swizzle.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\ir_tree_grafting.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\ir_vec_index_to_cond_assign.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\ir_vec_index_to_swizzle.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\link_functions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\linker.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\loop_controls.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\loop_unroll.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\lower_noise.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\lower_variable_index_to_cond_assign.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\talloc\talloc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\program\hash_table.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\program\symbol_table.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\pp.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\getopt.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_token.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\glsl\cl\sl_cl_parse.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_context.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_dict.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_expression.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_macro.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_process.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_public.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_purify.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_token_util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/glu/glu.vcxproj b/mesalib/windows/VC8/mesa/glu/glu.vcxproj
index 24ec449bb..768349a49 100644
--- a/mesalib/windows/VC8/mesa/glu/glu.vcxproj
+++ b/mesalib/windows/VC8/mesa/glu/glu.vcxproj
@@ -1,18 +1,10 @@
 <?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 Static CRT|Win32">
-      <Configuration>Debug Static CRT</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Static CRT|Win32">
-      <Configuration>Release Static CRT</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -23,16 +15,6 @@
     <RootNamespace>glu</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|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>
@@ -46,14 +28,6 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|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 Static CRT|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" />
@@ -71,12 +45,6 @@
     <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)'=='Debug Static CRT|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>
@@ -164,96 +132,6 @@ if exist ..\..\..\..\progs\demos copy "$(TargetDir)GLU32.DLL" ..\..\..\..\progs\
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Debug/glu.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GLU32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)GLU32.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>..\..\..\..\src\glu\sgi\glu.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)GLU32.pdb</ProgramDatabaseFile>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <PostBuildEvent>
-      <Command>if not exist ..\..\..\..\lib md ..\..\..\..\lib
-copy "$(TargetDir)GLU32.LIB" ..\..\..\..\lib
-copy "$(TargetDir)GLU32.DLL" ..\..\..\..\lib
-if exist ..\..\..\..\progs\demos copy "$(TargetDir)GLU32.DLL" ..\..\..\..\progs\demos
-</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Release/glu.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GLU32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)GLU32.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>..\..\..\..\src\glu\sgi\glu.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(TargetDir)GLU32.pdb</ProgramDatabaseFile>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <PostBuildEvent>
-      <Command>if not exist ..\..\..\..\lib md ..\..\..\..\lib
-copy "$(TargetDir)GLU32.LIB" ..\..\..\..\lib
-copy "$(TargetDir)GLU32.DLL" ..\..\..\..\lib
-if exist ..\..\..\..\progs\demos copy "$(TargetDir)GLU32.DLL" ..\..\..\..\progs\demos
-</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\dict.c" />
     <ClCompile Include="..\..\..\..\src\glu\sgi\libutil\error.c" />
@@ -264,9 +142,7 @@ if exist ..\..\..\..\progs\demos copy "$(TargetDir)GLU32.DLL" ..\..\..\..\progs\
     <ClCompile Include="..\..\..\..\src\glu\sgi\libutil\mipmap.c" />
     <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\normal.c" />
     <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\priorityq-heap.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\priorityq.c" />
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcproj
index 758368854..eb78e6c60 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcproj
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcproj
@@ -503,6 +503,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\..\src\mesa\glapi\glapi_entrypoint.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\..\src\mesa\glapi\glapi_getproc.c"
 				>
 			</File>
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
index 42a0c1fb7..90e16232c 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
@@ -1,18 +1,10 @@
 <?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 Static CRT|Win32">
-      <Configuration>Debug Static CRT</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Static CRT|Win32">
-      <Configuration>Release Static CRT</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -23,16 +15,6 @@
     <RootNamespace>mesa</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
@@ -46,14 +28,6 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|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 Static CRT|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" />
@@ -70,12 +44,6 @@
     <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>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">$(Configuration)\</IntDir>
-    <PreBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">true</PreBuildEventUseInBuild>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">$(Configuration)\</IntDir>
-    <PreBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">true</PreBuildEventUseInBuild>
     <PreLinkEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</PreLinkEventUseInBuild>
     <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</PostBuildEventUseInBuild>
   </PropertyGroup>
@@ -85,8 +53,8 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <OmitFramePointers>true</OmitFramePointers>
       <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/mesa/glapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_DLL;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/talloc;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_DLL;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -94,7 +62,6 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>Default</CompileAs>
       <ForcedIncludeFiles>../../../../src/mesa/main/compiler.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
     </ClCompile>
     <ResourceCompile>
@@ -109,38 +76,14 @@
     <ClCompile>
       <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/mesa/glapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;_DLL;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/talloc;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;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>
-      <CompileAs>CompileAsC</CompileAs>
-      <ForcedIncludeFiles>../../../../src/mesa/main/compiler.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/mesa/glapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
       <ForcedIncludeFiles>../../../../src/mesa/main/compiler.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
     </ClCompile>
     <ResourceCompile>
@@ -151,36 +94,6 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/mesa/glapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>Default</CompileAs>
-      <ForcedIncludeFiles>../../../../src/mesa/main/compiler.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
   <ItemGroup>
     <ProjectReference Include="..\glsl_apps_compile\glsl_apps_compile.vcxproj">
       <Project>{98ab3d51-1820-4d14-9195-75fca6997784}</Project>
@@ -189,16 +102,100 @@
     </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_function.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_algebraic.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_constant_folding.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_constant_propagation.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_constant_variable.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_copy_propagation.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_dead_code.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_dead_code_local.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_dead_functions.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_div_to_mul_rcp.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_explog_to_explog2.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_function_inlining.cpp">
+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </ForcedIncludeFiles>
+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </ForcedIncludeFiles>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\ir_hierarchical_visitor.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_hv_accept.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_if_simplification.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_if_to_cond_assign.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_import_prototypes.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_lower_jumps.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_mat_op_to_vec.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_mod_to_fract.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_noop_swizzle.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_structure_splitting.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_sub_to_add_neg.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_swizzle_swizzle.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_tree_grafting.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\ir_vec_index_to_cond_assign.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_vec_index_to_swizzle.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_noise.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\lower_variable_index_to_cond_assign.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp" />
+    <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\shader\arbprogparse.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\arbprogram.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\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\shader\atifragshader.c" />
     <ClCompile Include="..\..\..\..\src\mesa\main\attrib.c" />
     <ClCompile Include="..\..\..\..\src\mesa\main\blend.c" />
     <ClCompile Include="..\..\..\..\src\mesa\main\bufferobj.c" />
@@ -229,28 +226,33 @@
     <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\glapi\glapi.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\glapi\glapi_dispatch.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\glapi\glapi_getproc.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\glapi\glapi_nop.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\glapi\glthread.c" />
     <ClCompile Include="..\..\..\..\src\mesa\main\hash.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\hash_table.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\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\shader\lex.yy.c">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\mesa\main\light.c" />
     <ClCompile Include="..\..\..\..\src\mesa\main\lines.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\math\m_debug_clip.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\math\m_debug_norm.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\math\m_debug_xform.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" />
@@ -260,108 +262,18 @@
     <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\shader\nvfragparse.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\nvprogram.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\nvvertparse.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\shader\prog_cache.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_execute.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_instruction.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_noise.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_optimize.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_parameter.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_parameter_layout.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_print.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_statevars.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_uniform.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\program.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\program_parse.tab.c">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">YYMALLOC=malloc;YYFREE=free;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">YYMALLOC=malloc;YYFREE=free;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">YYMALLOC=malloc;YYFREE=free;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">YYMALLOC=malloc;YYFREE=free;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\program_parse_extra.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\programopt.c" />
     <ClCompile Include="..\..\..\..\src\mesa\main\queryobj.c" />
     <ClCompile Include="..\..\..\..\src\mesa\main\rastpos.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\main\rbadaptors.c" />
     <ClCompile Include="..\..\..\..\src\mesa\main\readpix.c" />
     <ClCompile Include="..\..\..\..\src\mesa\main\renderbuffer.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\main\scissor.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\shader_api.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\main\shaders.c" />
     <ClCompile Include="..\..\..\..\src\mesa\main\shared.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\cl\sl_cl_parse.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_context.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_define.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_dict.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_error.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_expression.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_extension.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_if.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_line.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_macro.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_pragma.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_process.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_purify.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_token.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_token_util.c" />
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_version.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_builtin.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_codegen.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_compile.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_compile_function.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_compile_operation.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_compile_struct.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_compile_variable.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_emit.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_ir.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_label.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_link.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_log.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_mem.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_print.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_simplify.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_storage.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_typeinfo.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_utility.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_vartable.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\swrast_setup\ss_context.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\swrast_setup\ss_triangle.c" />
     <ClCompile Include="..\..\..\..\src\mesa\main\state.c" />
     <ClCompile Include="..\..\..\..\src\mesa\main\stencil.c" />
-    <ClCompile Include="..\..\..\..\src\mesa\shader\symbol_table.c" />
     <ClCompile Include="..\..\..\..\src\mesa\main\syncobj.c" />
     <ClCompile Include="..\..\..\..\src\mesa\tnl\t_context.c" />
     <ClCompile Include="..\..\..\..\src\mesa\tnl\t_draw.c" />
@@ -413,370 +325,10 @@
     <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\mesa\main\accum.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\api_arrayelt.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\api_exec.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\api_loopback.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\api_noop.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\api_validate.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\arbprogparse.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\arbprogram.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\arrayobj.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\atifragshader.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\attrib.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\bitset.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\blend.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\bufferobj.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\buffers.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\clear.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\clip.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\colormac.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\colortab.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\condrender.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\config.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\context.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\convolve.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\cpuinfo.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\dd.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\debug.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\depth.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\depthstencil.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\dlist.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\dlopen.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\drawpix.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\enable.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\enums.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\eval.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\extensions.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\fbobject.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\feedback.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\ffvertex_prog.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\fog.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\formats.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\framebuffer.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\get.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\glapi\glapi.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\glapi\glapioffsets.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\glapi\glapitable.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\glapi\glapitemp.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\glheader.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\glapi\glprocs.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\glapi\glthread.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\hash.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\hash_table.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\hint.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\histogram.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\image.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\imports.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\light.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\lines.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\math\m_clip_tmp.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\math\m_copy_tmp.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\math\m_debug.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\math\m_debug_util.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\math\m_dotprod_tmp.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\math\m_eval.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\math\m_matrix.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\math\m_norm_tmp.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\math\m_trans_tmp.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\math\m_translate.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\math\m_vector.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\math\m_xform.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\math\m_xform_tmp.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\macros.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\matrix.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\mfeatures.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\mipmap.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\mm.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\mtypes.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\multisample.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\nvfragparse.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\nvprogram.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\nvvertparse.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\pixel.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\pixelstore.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\points.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\polygon.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_execute.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_instruction.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_noise.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_optimize.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_parameter.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_parameter_layout.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_print.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_statevars.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_uniform.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\program.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\program_parse.tab.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\programopt.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\queryobj.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\rastpos.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\rbadaptors.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\readpix.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\remap.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\renderbuffer.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_aaline.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_aalinetemp.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_aatriangle.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_aatritemp.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_accum.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_alpha.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_atifragshader.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_blend.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_context.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_depth.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_drawpix.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_feedback.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_fog.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_fragprog.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_lines.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_linetemp.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_logic.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_masking.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_points.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_span.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_spantemp.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_stencil.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_texcombine.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_texfilter.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_triangle.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_trispan.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_tritemp.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_zoom.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\scissor.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\shader_api.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\shaders.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\shared.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\simple_list.h" />
-    <ClInclude Include="..\..\..\..\src\glsl\cl\sl_cl_parse.h" />
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_context.h" />
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_dict.h" />
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_expression.h" />
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_macro.h" />
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_process.h" />
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_public.h" />
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_purify.h" />
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_token.h" />
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_token_util.h" />
-    <CustomBuild Include="..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">Building slang_120_core_gc.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building slang_120_core_gc.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">Building slang_120_core_gc.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building slang_120_core_gc.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h</Outputs>
-    </CustomBuild>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_builtin.h" />
-    <CustomBuild Include="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">Building slang_builtin_120_common_gc.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building slang_builtin_120_common_gc.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">Building slang_builtin_120_common_gc.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building slang_builtin_120_common_gc.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">Building slang_builtin_120_fragment_gc.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building slang_builtin_120_fragment_gc.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">Building slang_builtin_120_fragment_gc.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building slang_builtin_120_fragment_gc.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h</Outputs>
-    </CustomBuild>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_codegen.h" />
-    <CustomBuild Include="..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">Building slang_common_builtin_gc.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building slang_common_builtin_gc.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">Building slang_common_builtin_gc.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building slang_common_builtin_gc.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h</Outputs>
-    </CustomBuild>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_compile.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_compile_function.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_compile_operation.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_compile_struct.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_compile_variable.h" />
-    <CustomBuild Include="..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">Building slang_core_gc.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_core.gc</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building slang_core_gc.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_core.gc</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">Building slang_core_gc.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_core.gc</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building slang_core_gc.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_core.gc</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h</Outputs>
-    </CustomBuild>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_emit.h" />
-    <CustomBuild Include="..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">Building slang_fragment_builtin_gc.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building slang_fragment_builtin_gc.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">Building slang_fragment_builtin_gc.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building slang_fragment_builtin_gc.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h</Outputs>
-    </CustomBuild>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_ir.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_label.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_link.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_log.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_mem.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_print.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_simplify.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_storage.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_typeinfo.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_utility.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_vartable.h" />
-    <CustomBuild Include="..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">Building slang_vertex_builtin_gc.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\glsl\apps\compile.exe vertex ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building slang_vertex_builtin_gc.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\apps\compile.exe vertex ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">Building slang_vertex_builtin_gc.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\glsl\apps\compile.exe vertex ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building slang_vertex_builtin_gc.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\apps\compile.exe vertex ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h</Outputs>
-    </CustomBuild>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast_setup\ss_context.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast_setup\ss_triangle.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast_setup\ss_tritmp.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast_setup\ss_vb.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\state.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\stencil.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\swrast.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\swrast_setup\swrast_setup.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\shader\symbol_table.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\syncobj.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\tnl\t_context.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\tnl\t_pipeline.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\tnl\t_vb_cliptmp.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\tnl\t_vb_lighttmp.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\tnl\t_vb_rendertmp.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\tnl\t_vertex.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\tnl\t_vp_build.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\texcompress.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\texenv.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\texenvprogram.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\texfetch.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\texfetch_tmp.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\texformat.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\texgen.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\texgetimage.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\teximage.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\texobj.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\texparam.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\texrender.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\texstate.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\texstore.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\tnl\tnl.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\varray.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\vbo\vbo.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\vbo\vbo_attrib.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\vbo\vbo_attrib_tmp.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\vbo\vbo_context.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\vbo\vbo_exec.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\vbo\vbo_save.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\vbo\vbo_split.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\version.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\viewport.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\vtxfmt.h" />
-    <ClInclude Include="..\..\..\..\src\mesa\main\vtxfmt_tmp.h" />
+    <ClCompile Include="..\..\..\..\src\mesa\vf\vf.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\vf\vf_generic.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\vf\vf_sse.c" />
+    <ClCompile Include="..\..\..\..\src\talloc\talloc.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
index 4735a0ce6..963904982 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
@@ -11,9 +11,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\mesa\main\accum.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\mesa\main\api_arrayelt.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -29,18 +26,9 @@
     <ClCompile Include="..\..\..\..\src\mesa\main\api_validate.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\arbprogparse.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\arbprogram.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\mesa\main\arrayobj.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\atifragshader.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\mesa\main\attrib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -131,1176 +119,533 @@
     <ClCompile Include="..\..\..\..\src\mesa\main\getstring.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\glapi\glapi.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\hash.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\glapi\glapi_dispatch.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\hint.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\glapi\glapi_getproc.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\histogram.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\glapi\glapi_nop.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\image.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\glapi\glthread.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\imports.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\hash.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\light.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\hash_table.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\lines.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\hint.c">
+    <ClCompile Include="..\..\..\..\src\mesa\math\m_eval.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\histogram.c">
+    <ClCompile Include="..\..\..\..\src\mesa\math\m_matrix.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\image.c">
+    <ClCompile Include="..\..\..\..\src\mesa\math\m_translate.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\imports.c">
+    <ClCompile Include="..\..\..\..\src\mesa\math\m_vector.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\lex.yy.c">
+    <ClCompile Include="..\..\..\..\src\mesa\math\m_xform.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\light.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\matrix.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\lines.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\mipmap.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\math\m_debug_clip.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\mm.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\math\m_debug_norm.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\multisample.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\math\m_debug_xform.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\pixel.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\math\m_eval.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\pixelstore.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\math\m_matrix.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\points.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\math\m_translate.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\polygon.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\math\m_vector.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\queryobj.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\math\m_xform.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\rastpos.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\matrix.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\readpix.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\mipmap.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\renderbuffer.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\mm.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\scissor.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\multisample.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\shared.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\nvfragparse.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\state.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\nvprogram.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\stencil.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\nvvertparse.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\syncobj.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\pixel.c">
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_context.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\pixelstore.c">
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_draw.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\points.c">
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_pipeline.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\polygon.c">
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_rasterpos.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_cache.c">
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_cull.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_fog.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_execute.c">
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_light.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_instruction.c">
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_normals.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_noise.c">
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_points.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_optimize.c">
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_program.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_parameter.c">
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_render.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_parameter_layout.c">
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_texgen.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_print.c">
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_texmat.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_statevars.c">
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_vertex.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_uniform.c">
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vertex.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\program.c">
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vertex_generic.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\program_parse.tab.c">
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vp_build.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\program_parse_extra.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\programopt.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_fxt1.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\queryobj.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_s3tc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\rastpos.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\texenv.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\rbadaptors.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\texenvprogram.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\readpix.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\texfetch.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\renderbuffer.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\texformat.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_aaline.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\texgen.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_aatriangle.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\texgetimage.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_accum.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\teximage.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_alpha.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\texobj.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_atifragshader.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\texparam.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_bitmap.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\texrender.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_blend.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\texstate.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_blit.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\texstore.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_clear.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\varray.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_context.c">
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_context.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_copypix.c">
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_depth.c">
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_api.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_drawpix.c">
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_array.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_feedback.c">
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_draw.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_fog.c">
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_eval.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_fragprog.c">
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_rebase.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_lines.c">
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_logic.c">
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_api.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_masking.c">
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_draw.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_points.c">
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_loopback.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_readpix.c">
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_span.c">
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split_copy.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_stencil.c">
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split_inplace.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_texcombine.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\version.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_texfilter.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\viewport.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_triangle.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\vtxfmt.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_zoom.c">
+    <ClCompile Include="..\..\..\..\src\mesa\program\arbprogparse.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\scissor.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\arbprogram.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\shader_api.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\atifragshader.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\shaders.c">
+    <ClCompile Include="..\..\..\..\src\mesa\program\symbol_table.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\shared.c">
+    <ClCompile Include="..\..\..\..\src\mesa\program\programopt.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\cl\sl_cl_parse.c">
+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_uniform.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_context.c">
+    <ClCompile Include="..\..\..\..\src\mesa\program\program.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_define.c">
+    <ClCompile Include="..\..\..\..\src\mesa\program\program_parse_extra.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_dict.c">
+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_cache.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_error.c">
+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_execute.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_expression.c">
+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_instruction.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_extension.c">
+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_noise.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_if.c">
+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_optimize.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_line.c">
+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_parameter.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_macro.c">
+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_parameter_layout.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_pragma.c">
+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_print.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_process.c">
+    <ClCompile Include="..\..\..\..\src\mesa\program\prog_statevars.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_purify.c">
+    <ClCompile Include="..\..\..\..\src\mesa\program\hash_table.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_token.c">
+    <ClCompile Include="..\..\..\..\src\mesa\program\nvfragparse.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_token_util.c">
+    <ClCompile Include="..\..\..\..\src\mesa\program\nvvertparse.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_version.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\nvprogram.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_builtin.c">
+    <ClCompile Include="..\..\..\..\src\mesa\program\lex.yy.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_codegen.c">
+    <ClCompile Include="..\..\..\..\src\mesa\program\program_parse.tab.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_compile.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\transformfeedback.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_compile_function.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\shaderobj.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_compile_operation.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\shaderapi.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_compile_struct.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\accum.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_compile_variable.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\querymatrix.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_emit.c">
+    <ClCompile Include="..\..\..\..\src\mesa\main\uniforms.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_ir.c">
+    <ClCompile Include="..\..\..\..\src\mesa\vf\vf.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_label.c">
+    <ClCompile Include="..\..\..\..\src\mesa\vf\vf_generic.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_link.c">
+    <ClCompile Include="..\..\..\..\src\mesa\vf\vf_sse.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_log.c">
+    <ClCompile Include="..\..\..\..\src\mesa\program\ir_to_mesa.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_mem.c">
+    <ClCompile Include="..\..\..\..\src\talloc\talloc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_print.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_simplify.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_div_to_mul_rcp.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_storage.c">
+    <ClCompile Include="..\..\..\..\src\glsl\lower_variable_index_to_cond_assign.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_typeinfo.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_hierarchical_visitor.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_utility.c">
+    <ClCompile Include="..\..\..\..\src\glsl\glsl_types.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_vartable.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_variable.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast_setup\ss_context.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_function.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\swrast_setup\ss_triangle.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_function_can_inline.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\state.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_function_inlining.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\stencil.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_rvalue_visitor.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\shader\symbol_table.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_hv_accept.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\syncobj.c">
+    <ClCompile Include="..\..\..\..\src\glsl\glsl_symbol_table.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_context.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_constant_expression.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_draw.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_clone.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_pipeline.c">
+    <ClCompile Include="..\..\..\..\src\glsl\linker.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_rasterpos.c">
+    <ClCompile Include="..\..\..\..\src\glsl\glsl_parser_extras.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_cull.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_dead_functions.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_fog.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_copy_propagation.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_light.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_if_simplification.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_normals.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_dead_code.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_points.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_dead_code_local.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_program.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_variable_refcount.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_render.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_basic_block.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_texgen.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_constant_variable.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_texmat.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_constant_propagation.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_vertex.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_sub_to_add_neg.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vertex.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_algebraic.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vertex_generic.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_vec_index_to_swizzle.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vp_build.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_tree_grafting.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_constant_folding.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_fxt1.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_noop_swizzle.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_s3tc.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_structure_splitting.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\texenv.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_swizzle_swizzle.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\texenvprogram.c">
+    <ClCompile Include="..\..\..\..\src\glsl\builtin_function.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\texfetch.c">
+    <ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\texformat.c">
+    <ClCompile Include="..\..\..\..\src\glsl\loop_controls.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\texgen.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_expression_flattening.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\texgetimage.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_import_prototypes.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\teximage.c">
+    <ClCompile Include="..\..\..\..\src\glsl\link_functions.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\texobj.c">
+    <ClCompile Include="..\..\..\..\src\glsl\loop_unroll.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\texparam.c">
+    <ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\texrender.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\texstate.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ast_expr.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\texstore.c">
+    <ClCompile Include="..\..\..\..\src\glsl\hir_field_selection.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\varray.c">
+    <ClCompile Include="..\..\..\..\src\glsl\glsl_lexer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_context.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec.c">
+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\pp.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_api.c">
+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_array.c">
+    <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_draw.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_reader.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_eval.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_mat_op_to_vec.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_rebase.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_lower_jumps.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save.c">
+    <ClCompile Include="..\..\..\..\src\glsl\glsl_parser.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_api.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_explog_to_explog2.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_draw.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_if_to_cond_assign.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_loopback.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_mod_to_fract.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_print_visitor.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split_copy.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_validate.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split_inplace.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_vec_index_to_cond_assign.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\version.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ir_set_program_inouts.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\viewport.c">
+    <ClCompile Include="..\..\..\..\src\glsl\lower_noise.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\vtxfmt.c">
+    <ClCompile Include="..\..\..\..\src\glsl\ast_function.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\mesa\main\accum.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\api_arrayelt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\api_exec.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\api_loopback.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\api_noop.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\api_validate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\arbprogparse.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\arbprogram.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\arrayobj.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\atifragshader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\attrib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\bitset.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\blend.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\bufferobj.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\buffers.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\clear.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\clip.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\colormac.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\colortab.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\condrender.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\context.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\convolve.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\cpuinfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\dd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\debug.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\depth.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\depthstencil.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\dlist.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\dlopen.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\drawpix.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\enable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\enums.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\eval.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\extensions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\fbobject.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\feedback.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\ffvertex_prog.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\fog.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\formats.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\framebuffer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\get.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\glapi\glapi.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\glapi\glapioffsets.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\glapi\glapitable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\glapi\glapitemp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\glheader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\glapi\glprocs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\glapi\glthread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\hash.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\hash_table.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\hint.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\histogram.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\image.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\imports.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\light.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\lines.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\math\m_clip_tmp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\math\m_copy_tmp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\math\m_debug.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\math\m_debug_util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\math\m_dotprod_tmp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\math\m_eval.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\math\m_matrix.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\math\m_norm_tmp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\math\m_trans_tmp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\math\m_translate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\math\m_vector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\math\m_xform.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\math\m_xform_tmp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\macros.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\matrix.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\mfeatures.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\mipmap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\mm.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\mtypes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\multisample.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\nvfragparse.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\nvprogram.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\nvvertparse.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\pixel.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\pixelstore.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\points.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\polygon.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_execute.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_instruction.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_noise.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_optimize.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_parameter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_parameter_layout.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_print.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_statevars.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_uniform.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\program.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\program_parse.tab.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\programopt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\queryobj.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\rastpos.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\rbadaptors.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\readpix.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\remap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\renderbuffer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_aaline.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_aalinetemp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_aatriangle.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_aatritemp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_accum.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_alpha.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_atifragshader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_blend.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_context.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_depth.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_drawpix.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_feedback.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_fog.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_fragprog.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_lines.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_linetemp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_logic.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_masking.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_points.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_span.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_spantemp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_stencil.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_texcombine.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_texfilter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_triangle.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_trispan.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_tritemp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_zoom.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\scissor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\shader_api.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\shaders.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\shared.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\simple_list.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\glsl\cl\sl_cl_parse.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_context.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_dict.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_expression.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_macro.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_process.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_public.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_purify.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_token.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_token_util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_builtin.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_codegen.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_compile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_compile_function.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_compile_operation.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_compile_struct.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_compile_variable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_emit.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_ir.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_label.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_link.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_log.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_mem.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_print.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_simplify.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_storage.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_typeinfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_utility.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_vartable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast_setup\ss_context.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast_setup\ss_triangle.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast_setup\ss_tritmp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast_setup\ss_vb.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\state.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\stencil.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast\swrast.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\swrast_setup\swrast_setup.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\shader\symbol_table.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\syncobj.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\tnl\t_context.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\tnl\t_pipeline.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\tnl\t_vb_cliptmp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\tnl\t_vb_lighttmp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\tnl\t_vb_rendertmp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\tnl\t_vertex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\tnl\t_vp_build.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\texcompress.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\texenv.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\texenvprogram.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\texfetch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\texfetch_tmp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\texformat.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\texgen.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\texgetimage.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\teximage.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\texobj.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\texparam.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\texrender.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\texstate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\texstore.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\tnl\tnl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\varray.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\vbo\vbo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\vbo\vbo_attrib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\vbo\vbo_attrib_tmp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\vbo\vbo_context.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\vbo\vbo_exec.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\vbo\vbo_save.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\vbo\vbo_split.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\version.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\viewport.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\vtxfmt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mesa\main\vtxfmt_tmp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h">
-      <Filter>Header Files</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h">
-      <Filter>Header Files</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h">
-      <Filter>Header Files</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h">
-      <Filter>Header Files</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h">
-      <Filter>Header Files</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h">
-      <Filter>Header Files</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h">
-      <Filter>Header Files</Filter>
-    </CustomBuild>
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/mesavc10.sln b/mesalib/windows/VC8/mesa/mesavc10.sln
index d5e6f9883..72926f1aa 100644
--- a/mesalib/windows/VC8/mesa/mesavc10.sln
+++ b/mesalib/windows/VC8/mesa/mesavc10.sln
@@ -14,46 +14,26 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swrast_dri", "swrast_dri\sw
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Static CRT|Win32 = Debug Static CRT|Win32
 		Debug|Win32 = Debug|Win32
-		Release Static CRT|Win32 = Release Static CRT|Win32
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A1B24907-E196-4826-B6AF-26723629B633}.Debug Static CRT|Win32.ActiveCfg = Debug Static CRT|Win32
 		{A1B24907-E196-4826-B6AF-26723629B633}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A1B24907-E196-4826-B6AF-26723629B633}.Release Static CRT|Win32.ActiveCfg = Release Static CRT|Win32
 		{A1B24907-E196-4826-B6AF-26723629B633}.Release|Win32.ActiveCfg = Release|Win32
-		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Debug Static CRT|Win32.ActiveCfg = Debug Static CRT|Win32
 		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Release Static CRT|Win32.ActiveCfg = Release Static CRT|Win32
 		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Release|Win32.ActiveCfg = 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
 		{2120C974-2717-4709-B44F-D6E6D0A56448}.Debug|Win32.Build.0 = Debug|Win32
-		{2120C974-2717-4709-B44F-D6E6D0A56448}.Release Static CRT|Win32.ActiveCfg = Release Static CRT|Win32
-		{2120C974-2717-4709-B44F-D6E6D0A56448}.Release Static CRT|Win32.Build.0 = Release Static CRT|Win32
 		{2120C974-2717-4709-B44F-D6E6D0A56448}.Release|Win32.ActiveCfg = Release|Win32
 		{2120C974-2717-4709-B44F-D6E6D0A56448}.Release|Win32.Build.0 = Release|Win32
-		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Debug Static CRT|Win32.ActiveCfg = Debug Static CRT|Win32
 		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release Static CRT|Win32.ActiveCfg = Release Static CRT|Win32
 		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release|Win32.ActiveCfg = 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
 		{98AB3D51-1820-4D14-9195-75FCA6997784}.Debug|Win32.Build.0 = Debug|Win32
-		{98AB3D51-1820-4D14-9195-75FCA6997784}.Release Static CRT|Win32.ActiveCfg = Release|Win32
-		{98AB3D51-1820-4D14-9195-75FCA6997784}.Release Static CRT|Win32.Build.0 = Release|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 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
 	EndGlobalSection
diff --git a/mesalib/windows/VC8/mesa/osmesa/osmesa.vcxproj b/mesalib/windows/VC8/mesa/osmesa/osmesa.vcxproj
index 23b03ec11..e93c4ead6 100644
--- a/mesalib/windows/VC8/mesa/osmesa/osmesa.vcxproj
+++ b/mesalib/windows/VC8/mesa/osmesa/osmesa.vcxproj
@@ -1,18 +1,10 @@
 <?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 Static CRT|Win32">
-      <Configuration>Debug Static CRT</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Static CRT|Win32">
-      <Configuration>Release Static CRT</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -23,16 +15,6 @@
     <RootNamespace>osmesa</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|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>
@@ -46,14 +28,6 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|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 Static CRT|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" />
@@ -71,12 +45,6 @@
     <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)'=='Debug Static CRT|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>
@@ -167,95 +135,6 @@ if exist ..\..\..\..\progs\demos copy "$(TargetDir)OSMESA32.DLL" ..\..\..\..\pro
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Debug/osmesa.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/mesa/main;../../../../src/mesa/glapi;../../../../src/mesa/swrast;../../../../src/mesa/shader;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS;BUILD_GL32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <ForcedIncludeFiles>../../../../src/mesa/main/compiler.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>gdi32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)OSMESA32.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>..\..\..\..\src\mesa\drivers\osmesa\osmesa.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)OSMESA32.pdb</ProgramDatabaseFile>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <PostBuildEvent>
-      <Command>if not exist ..\..\..\..\lib md ..\..\..\..\lib
-copy "$(TargetDir)OSMESA32.LIB" ..\..\..\..\lib
-copy "$(TargetDir)OSMESA32.DLL" ..\..\..\..\lib
-if exist ..\..\..\..\progs\demos copy "$(TargetDir)OSMESA32.DLL" ..\..\..\..\progs\demos
-</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Release/osmesa.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/mesa/main;../../../../src/mesa/glapi;../../../../src/mesa/swrast;../../../../src/mesa/shader;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS;BUILD_GL32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>Default</CompileAs>
-      <ForcedIncludeFiles>../../../../src/mesa/main/compiler.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>gdi32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)OSMESA32.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>..\..\..\..\src\mesa\drivers\osmesa\osmesa.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(TargetDir)OSMESA32.pdb</ProgramDatabaseFile>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <PostBuildEvent>
-      <Command>if not exist ..\..\..\..\lib md ..\..\..\..\lib
-copy "$(TargetDir)OSMESA32.LIB" ..\..\..\..\lib
-copy "$(TargetDir)OSMESA32.DLL" ..\..\..\..\lib
-if exist ..\..\..\..\progs\demos copy "$(TargetDir)OSMESA32.DLL" ..\..\..\..\progs\demos
-</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\src\mesa\drivers\osmesa\osmesa.c" />
   </ItemGroup>
diff --git a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj
index d18e83b88..6ab9bb3fb 100644
--- a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj
+++ b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj
@@ -1,18 +1,10 @@
 <?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 Static CRT|Win32">
-      <Configuration>Debug Static CRT</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Static CRT|Win32">
-      <Configuration>Release Static CRT</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -23,16 +15,6 @@
     <RootNamespace>swrast_dri</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
@@ -46,14 +28,6 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|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 Static CRT|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" />
@@ -71,12 +45,6 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>
@@ -88,8 +56,8 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa/drivers/dri/common;../../../../src/mesa;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;SWRAST_DRI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN;IN_DRI_DRIVER;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa/drivers/dri/common;../../../../src/mapi;../../../../src/mesa;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;SWRAST_DRI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BrowseInformation>true</BrowseInformation>
@@ -127,8 +95,8 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <OmitFramePointers>true</OmitFramePointers>
       <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa/drivers/dri/common;../../../../src/mesa;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;SWRAST_DRI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN;IN_DRI_DRIVER;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa/drivers/dri/common;../../../../src/mapi;../../../../src/mesa;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;SWRAST_DRI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -158,93 +126,42 @@
       </DataExecutionPrevention>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|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/drivers/dri/common;../../../../src/mesa;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;SWRAST_DRI_EXPORTS;BUILD_GL32;MESA_MINWARN;IN_DRI_DRIVER;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</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 Static CRT|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/drivers/dri/common;../../../../src/mesa;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;SWRAST_DRI_EXPORTS;BUILD_GL32;MESA_MINWARN;IN_DRI_DRIVER;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</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\main\remap.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" />
diff --git a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj.filters b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj.filters
index 29349d0f4..375cfd711 100644
--- a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj.filters
+++ b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj.filters
@@ -21,9 +21,6 @@
     <ClCompile Include="..\..\..\..\src\mesa\drivers\common\meta.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mesa\main\remap.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\swrast\swrast.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -33,6 +30,96 @@
     <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">