diff --git a/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcproj b/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcproj
new file mode 100644
index 00000000000..84e3464834a
--- /dev/null
+++ b/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcproj
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="glsl_apps_compile"
+	ProjectGUID="{98AB3D51-1820-4D14-9195-75FCA6997784}"
+	RootNamespace="glsl_apps_compile"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\compile.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy $(OutDir)\compile.exe ..\..\..\..\src\glsl\apps"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\compile.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy $(OutDir)\compile.exe ..\..\..\..\src\glsl\apps"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\..\src\glsl\apps\compile.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\cl\sl_cl_parse.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_context.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_define.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_dict.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_error.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_expression.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_extension.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_if.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_line.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_macro.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_pragma.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_process.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_purify.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_token.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_token.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_token_util.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_version.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\..\src\glsl\cl\sl_cl_parse.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_context.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_dict.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_expression.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_macro.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_process.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_public.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_purify.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_token_util.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/windows/VC8/mesa/mesa.sln b/windows/VC8/mesa/mesa.sln
index dd8c706ee12..915e00026cf 100644
--- a/windows/VC8/mesa/mesa.sln
+++ b/windows/VC8/mesa/mesa.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
+# Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdi", "gdi\gdi.vcproj", "{A1B24907-E196-4826-B6AF-26723629B633}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2120C974-2717-4709-B44F-D6E6D0A56448} = {2120C974-2717-4709-B44F-D6E6D0A56448}
@@ -11,12 +11,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glu", "glu\glu.vcproj", "{2
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mesa", "mesa\mesa.vcproj", "{2120C974-2717-4709-B44F-D6E6D0A56448}"
+	ProjectSection(ProjectDependencies) = postProject
+		{98AB3D51-1820-4D14-9195-75FCA6997784} = {98AB3D51-1820-4D14-9195-75FCA6997784}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osmesa", "osmesa\osmesa.vcproj", "{8D6CD423-383B-49E7-81BC-D20C70B07DF5}"
 	ProjectSection(ProjectDependencies) = postProject
 		{A1B24907-E196-4826-B6AF-26723629B633} = {A1B24907-E196-4826-B6AF-26723629B633}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glsl_apps_compile", "glsl_apps_compile\glsl_apps_compile.vcproj", "{98AB3D51-1820-4D14-9195-75FCA6997784}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug Static CRT|Win32 = Debug Static CRT|Win32
@@ -57,6 +62,14 @@ Global
 		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release Static CRT|Win32.Build.0 = Release Static CRT|Win32
 		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release|Win32.ActiveCfg = Release|Win32
 		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release|Win32.Build.0 = Release|Win32
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/windows/VC8/mesa/mesa/mesa.vcproj b/windows/VC8/mesa/mesa/mesa.vcproj
index 4719e342cf1..15ad2293280 100644
--- a/windows/VC8/mesa/mesa/mesa.vcproj
+++ b/windows/VC8/mesa/mesa/mesa.vcproj
@@ -26,9 +26,13 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine=""
+				ExcludedFromBuild="false"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
+				CommandLine=""
+				Outputs=""
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -97,9 +101,13 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine=""
+				ExcludedFromBuild="false"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
+				CommandLine=""
+				Outputs=""
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -168,9 +176,13 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine=""
+				ExcludedFromBuild="false"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
+				CommandLine=""
+				Outputs=""
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -239,9 +251,13 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine=""
+				ExcludedFromBuild="false"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
+				CommandLine=""
+				Outputs=""
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -300,6 +316,10 @@
 		</Configuration>
 	</Configurations>
 	<References>
+		<ProjectReference
+			ReferencedProjectIdentifier="{98AB3D51-1820-4D14-9195-75FCA6997784}"
+			RelativePathToProject=".\glsl_apps_compile\glsl_apps_compile.vcproj"
+		/>
 	</References>
 	<Files>
 		<Filter
@@ -374,6 +394,10 @@
 				RelativePath="..\..\..\..\src\mesa\main\colortab.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\main\condrender.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\main\context.c"
 				>
@@ -474,6 +498,10 @@
 				RelativePath="..\..\..\..\src\mesa\glapi\glapi_getproc.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\glapi\glapi_nop.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\glapi\glthread.c"
 				>
@@ -858,6 +886,70 @@
 				RelativePath="..\..\..\..\src\mesa\main\shared.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\cl\sl_cl_parse.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_context.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_define.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_dict.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_error.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_expression.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_extension.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_if.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_line.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_macro.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_pragma.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_process.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_purify.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_token.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_token_util.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_version.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_builtin.c"
 				>
@@ -910,10 +1002,6 @@
 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_mem.c"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_preprocess.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_print.c"
 				>
@@ -1150,6 +1238,10 @@
 				RelativePath="..\..\..\..\src\mesa\vbo\vbo_split_inplace.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\main\version.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\main\viewport.c"
 				>
@@ -1171,10 +1263,6 @@
 				RelativePath="..\..\..\..\src\mesa\main\api_arrayelt.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\api_eval.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\main\api_exec.h"
 				>
@@ -1199,10 +1287,6 @@
 				RelativePath="..\..\..\..\src\mesa\shader\arbprogram.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\arbprogram_syn.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\main\arrayobj.h"
 				>
@@ -1247,6 +1331,10 @@
 				RelativePath="..\..\..\..\src\mesa\main\colortab.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\main\condrender.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\main\config.h"
 				>
@@ -1451,18 +1539,10 @@
 				RelativePath="..\..\..\..\src\mesa\main\macros.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\math\mathmod.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\main\matrix.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\mcompiler.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\main\mfeatures.h"
 				>
@@ -1659,10 +1739,6 @@
 				RelativePath="..\..\..\..\src\mesa\swrast\s_points.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_pointtemp.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\swrast\s_span.h"
 				>
@@ -1719,14 +1795,246 @@
 				RelativePath="..\..\..\..\src\mesa\main\simple_list.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\cl\sl_cl_parse.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_context.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_dict.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_expression.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_macro.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_process.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_public.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_purify.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_token.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\glsl\pp\sl_pp_token_util.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Building predefined shaders"
+						CommandLine="..\..\..\..\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"
+						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc"
+						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Building predefined shaders"
+						CommandLine="..\..\..\..\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"
+						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc"
+						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug Static CRT|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Building predefined shaders"
+						CommandLine="..\..\..\..\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"
+						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc"
+						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release Static CRT|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Building predefined shaders"
+						CommandLine="..\..\..\..\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"
+						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc"
+						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_builtin.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Building predefined shaders"
+						CommandLine="..\..\..\..\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"
+						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc"
+						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Building predefined shaders"
+						CommandLine="..\..\..\..\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"
+						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc"
+						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug Static CRT|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Building predefined shaders"
+						CommandLine="..\..\..\..\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"
+						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc"
+						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release Static CRT|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Building predefined shaders"
+						CommandLine="..\..\..\..\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"
+						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc"
+						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Building predefined shaders"
+						CommandLine="..\..\..\..\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"
+						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc"
+						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Building predefined shaders"
+						CommandLine="..\..\..\..\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"
+						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc"
+						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug Static CRT|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Building predefined shaders"
+						CommandLine="..\..\..\..\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"
+						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc"
+						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release Static CRT|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Building predefined shaders"
+						CommandLine="..\..\..\..\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"
+						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc"
+						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_codegen.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Building predefined shaders"
+						CommandLine="..\..\..\..\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"
+						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc"
+						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Building predefined shaders"
+						CommandLine="..\..\..\..\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"
+						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc"
+						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug Static CRT|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Building predefined shaders"
+						CommandLine="..\..\..\..\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"
+						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc"
+						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release Static CRT|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Building predefined shaders"
+						CommandLine="..\..\..\..\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"
+						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc"
+						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile.h"
 				>
@@ -1747,10 +2055,106 @@
 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_variable.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Building predefined shaders"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h"
+						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_core_gc"
+						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Building predefined shaders"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h"
+						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_core_gc"
+						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug Static CRT|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Building predefined shaders"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h"
+						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_core_gc"
+						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release Static CRT|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Building predefined shaders"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h"
+						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_core_gc"
+						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_emit.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Building predefined shaders"
+						CommandLine="..\..\..\..\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"
+						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc"
+						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Building predefined shaders"
+						CommandLine="..\..\..\..\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"
+						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc"
+						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug Static CRT|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Building predefined shaders"
+						CommandLine="..\..\..\..\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"
+						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc"
+						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release Static CRT|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Building predefined shaders"
+						CommandLine="..\..\..\..\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"
+						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc"
+						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_ir.h"
 				>
@@ -1771,10 +2175,6 @@
 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_mem.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_preprocess.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_print.h"
 				>
@@ -1799,6 +2199,54 @@
 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_vartable.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Building predefined shaders"
+						CommandLine="..\..\..\..\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"
+						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc"
+						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Building predefined shaders"
+						CommandLine="..\..\..\..\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"
+						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc"
+						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug Static CRT|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Building predefined shaders"
+						CommandLine="..\..\..\..\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"
+						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc"
+						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release Static CRT|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Building predefined shaders"
+						CommandLine="..\..\..\..\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"
+						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc"
+						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_context.h"
 				>