svn merge -r524:HEAD "^/branches/released" .

4 files changed, 815 insertions, 58 deletions

diff --git a/mesalib/windows/VC8/mesa/gdi/gdi.vcproj b/mesalib/windows/VC8/mesa/gdi/gdi.vcproj
index 9a03fbd9d..ec2a7c941 100644
--- a/mesalib/windows/VC8/mesa/gdi/gdi.vcproj
+++ b/mesalib/windows/VC8/mesa/gdi/gdi.vcproj
@@ -403,6 +403,10 @@
 				>

 			</File>

 			<File

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

+				>

+			</File>

+			<File

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

 				>

 			</File>

@@ -424,6 +428,10 @@
 				>

 			</File>

 			<File

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

+				>

+			</File>

+			<File

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

 				>

 			</File>

diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcproj b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcproj
new file mode 100644
index 000000000..3fed6b466
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcproj
@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="9,00"

+	Name="glsl_apps_compile"

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

+	RootNamespace="glsl_apps_compile"

+	Keyword="Win32Proj"

+	TargetFrameworkVersion="131072"

+	>

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

+				DebugInformationFormat="4"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				OutputFile="$(OutDir)\compile.exe"

+				LinkIncremental="2"

+				GenerateDebugInformation="true"

+				SubSystem="1"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="copy &quot;$(OutDir)\compile.exe&quot; ..\..\..\..\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="false"

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

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="copy &quot;$(OutDir)\compile.exe&quot; ..\..\..\..\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/mesalib/windows/VC8/mesa/mesa.sln b/mesalib/windows/VC8/mesa/mesa.sln
index 8a008cfbd..494504e0f 100644
--- a/mesalib/windows/VC8/mesa/mesa.sln
+++ b/mesalib/windows/VC8/mesa/mesa.sln
@@ -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

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swrast_dri", "swrast_dri\swrast_dri.vcproj", "{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}"

 	ProjectSection(ProjectDependencies) = postProject

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

@@ -58,6 +63,14 @@ Global
 		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Release Static CRT|Win32.Build.0 = Release Static CRT|Win32

 		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Release|Win32.ActiveCfg = Release|Win32

 		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Release|Win32.Build.0 = Release|Win32

+		{98AB3D51-1820-4D14-9195-75FCA6997784}.Debug Static CRT|Win32.ActiveCfg = Debug|Win32

+		{98AB3D51-1820-4D14-9195-75FCA6997784}.Debug Static CRT|Win32.Build.0 = Debug|Win32

+		{98AB3D51-1820-4D14-9195-75FCA6997784}.Debug|Win32.ActiveCfg = Debug|Win32

+		{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/mesalib/windows/VC8/mesa/mesa/mesa.vcproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcproj
index 77a1ffd95..758368854 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcproj
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcproj
@@ -27,9 +27,13 @@
 			>

 			<Tool

 				Name="VCPreBuildEventTool"

+				CommandLine=""

+				ExcludedFromBuild="false"

 			/>

 			<Tool

 				Name="VCCustomBuildTool"

+				CommandLine=""

+				Outputs=""

 			/>

 			<Tool

 				Name="VCXMLDataGeneratorTool"

@@ -46,7 +50,7 @@
 				InlineFunctionExpansion="2"

 				OmitFramePointers="true"

 				WholeProgramOptimization="true"

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

+				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang"

 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_DLL;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER"

 				StringPooling="true"

 				RuntimeLibrary="2"

@@ -100,9 +104,13 @@
 			>

 			<Tool

 				Name="VCPreBuildEventTool"

+				CommandLine=""

+				ExcludedFromBuild="false"

 			/>

 			<Tool

 				Name="VCCustomBuildTool"

+				CommandLine=""

+				Outputs=""

 			/>

 			<Tool

 				Name="VCXMLDataGeneratorTool"

@@ -117,7 +125,7 @@
 				Name="VCCLCompilerTool"

 				AdditionalOptions="/Zm1000 "

 				Optimization="0"

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

+				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang"

 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_DLL;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

@@ -171,9 +179,13 @@
 			>

 			<Tool

 				Name="VCPreBuildEventTool"

+				CommandLine=""

+				ExcludedFromBuild="false"

 			/>

 			<Tool

 				Name="VCCustomBuildTool"

+				CommandLine=""

+				Outputs=""

 			/>

 			<Tool

 				Name="VCXMLDataGeneratorTool"

@@ -188,7 +200,7 @@
 				Name="VCCLCompilerTool"

 				AdditionalOptions="/Zm1000 "

 				Optimization="0"

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

+				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang"

 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -242,9 +254,13 @@
 			>

 			<Tool

 				Name="VCPreBuildEventTool"

+				CommandLine=""

+				ExcludedFromBuild="false"

 			/>

 			<Tool

 				Name="VCCustomBuildTool"

+				CommandLine=""

+				Outputs=""

 			/>

 			<Tool

 				Name="VCXMLDataGeneratorTool"

@@ -261,7 +277,7 @@
 				InlineFunctionExpansion="2"

 				OmitFramePointers="true"

 				WholeProgramOptimization="true"

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

+				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang"

 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER"

 				StringPooling="true"

 				ExceptionHandling="0"

@@ -308,6 +324,10 @@
 		</Configuration>

 	</Configurations>

 	<References>

+		<ProjectReference

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

+			RelativePathToProject=".\glsl_apps_compile\glsl_apps_compile.vcproj"

+		/>

 	</References>

 	<Files>

 		<Filter

@@ -383,6 +403,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\..\src\mesa\main\condrender.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\..\src\mesa\main\context.c"

 				>

 			</File>

@@ -407,10 +431,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\dispatch.c"

-				>

-			</File>

-			<File

 				RelativePath="..\..\..\..\src\mesa\main\dlist.c"

 				>

 			</File>

@@ -479,15 +499,19 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\..\src\mesa\glapi\glapi_dispatch.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\..\src\mesa\glapi\glapi_getproc.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\glapi\glthread.c"

+				RelativePath="..\..\..\..\src\mesa\glapi\glapi_nop.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_mesa.c"

+				RelativePath="..\..\..\..\src\mesa\glapi\glthread.c"

 				>

 			</File>

 			<File

@@ -526,7 +550,7 @@
 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						PreprocessorDefinitions="YY_NO_UNISTD_H;YY_USE_CONST;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

+						PreprocessorDefinitions="YY_USE_CONST;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -534,7 +558,7 @@
 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						PreprocessorDefinitions="YY_NO_UNISTD_H;YY_USE_CONST;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

+						PreprocessorDefinitions="YY_USE_CONST;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -542,7 +566,7 @@
 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						PreprocessorDefinitions="YY_NO_UNISTD_H;YY_USE_CONST;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

+						PreprocessorDefinitions="YY_USE_CONST;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -550,7 +574,7 @@
 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						PreprocessorDefinitions="YY_NO_UNISTD_H;YY_USE_CONST;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

+						PreprocessorDefinitions="YY_USE_CONST;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

 					/>

 				</FileConfiguration>

 			</File>

@@ -907,6 +931,70 @@
 				>

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

 				>

 			</File>

@@ -959,10 +1047,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_preprocess.c"

-				>

-			</File>

-			<File

 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_print.c"

 				>

 			</File>

@@ -1207,6 +1291,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\..\src\mesa\main\version.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\..\src\mesa\main\viewport.c"

 				>

 			</File>

@@ -1228,10 +1316,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\api_eval.h"

-				>

-			</File>

-			<File

 				RelativePath="..\..\..\..\src\mesa\main\api_exec.h"

 				>

 			</File>

@@ -1256,10 +1340,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\arbprogram_syn.h"

-				>

-			</File>

-			<File

 				RelativePath="..\..\..\..\src\mesa\main\arrayobj.h"

 				>

 			</File>

@@ -1304,6 +1384,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\..\src\mesa\main\condrender.h"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\..\src\mesa\main\config.h"

 				>

 			</File>

@@ -1380,6 +1464,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\..\src\mesa\main\formats.h"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\..\src\mesa\main\framebuffer.h"

 				>

 			</File>

@@ -1416,22 +1504,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_crt.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_mesa.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_syn.h"

-				>

-			</File>

-			<File

 				RelativePath="..\..\..\..\src\mesa\main\hash.h"

 				>

 			</File>

@@ -1520,18 +1592,10 @@
 				>

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

 				>

 			</File>

@@ -1728,10 +1792,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_pointtemp.h"

-				>

-			</File>

-			<File

 				RelativePath="..\..\..\..\src\mesa\swrast\s_span.h"

 				>

 			</File>

@@ -1788,14 +1848,246 @@
 				>

 			</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&#x0D;&#x0A;"

+						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&#x0D;&#x0A;"

+						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&#x0D;&#x0A;"

+						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&#x0D;&#x0A;"

+						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&#x0D;&#x0A;"

+						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&#x0D;&#x0A;"

+						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&#x0D;&#x0A;"

+						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&#x0D;&#x0A;"

+						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&#x0D;&#x0A;"

+						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&#x0D;&#x0A;"

+						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&#x0D;&#x0A;"

+						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&#x0D;&#x0A;"

+						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&#x0D;&#x0A;"

+						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&#x0D;&#x0A;"

+						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&#x0D;&#x0A;"

+						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&#x0D;&#x0A;"

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

 				>

 			</File>

@@ -1816,10 +2108,106 @@
 				>

 			</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&#x0D;&#x0A;"

+						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&#x0D;&#x0A;"

+						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&#x0D;&#x0A;"

+						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&#x0D;&#x0A;"

+						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&#x0D;&#x0A;"

+						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&#x0D;&#x0A;"

+						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&#x0D;&#x0A;"

+						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&#x0D;&#x0A;"

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

 				>

 			</File>

@@ -1840,10 +2228,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_preprocess.h"

-				>

-			</File>

-			<File

 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_print.h"

 				>

 			</File>

@@ -1868,6 +2252,54 @@
 				>

 			</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&#x0D;&#x0A;"

+						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&#x0D;&#x0A;"

+						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&#x0D;&#x0A;"

+						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&#x0D;&#x0A;"

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

 				>

 			</File>