Updated to following packages:

  mesa-7.8

3 files changed, 518 insertions, 61 deletions

diff --git a/mesalib/windows/VC8/mesa/gdi/gdi.vcproj b/mesalib/windows/VC8/mesa/gdi/gdi.vcproj
index a3dd5ef5b..220923f90 100644
--- a/mesalib/windows/VC8/mesa/gdi/gdi.vcproj
+++ b/mesalib/windows/VC8/mesa/gdi/gdi.vcproj
@@ -397,6 +397,10 @@
 				>

 			</File>

 			<File

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

+				>

+			</File>

+			<File

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

 				>

 			</File>

@@ -418,6 +422,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/mesa.sln b/mesalib/windows/VC8/mesa/mesa.sln
index dd8c706ee..915e00026 100644
--- a/mesalib/windows/VC8/mesa/mesa.sln
+++ b/mesalib/windows/VC8/mesa/mesa.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual 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/mesalib/windows/VC8/mesa/mesa/mesa.vcproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcproj
index 993c28ddc..f7c3c7344 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcproj
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcproj
@@ -26,9 +26,13 @@
 			>

 			<Tool

 				Name="VCPreBuildEventTool"

+				CommandLine=""

+				ExcludedFromBuild="false"

 			/>

 			<Tool

 				Name="VCCustomBuildTool"

+				CommandLine=""

+				Outputs=""

 			/>

 			<Tool

 				Name="VCXMLDataGeneratorTool"

@@ -43,7 +47,7 @@
 				Name="VCCLCompilerTool"

 				AdditionalOptions="/Zm1000 "

 				InlineFunctionExpansion="1"

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

 				StringPooling="true"

 				RuntimeLibrary="2"

@@ -97,9 +101,13 @@
 			>

 			<Tool

 				Name="VCPreBuildEventTool"

+				CommandLine=""

+				ExcludedFromBuild="false"

 			/>

 			<Tool

 				Name="VCCustomBuildTool"

+				CommandLine=""

+				Outputs=""

 			/>

 			<Tool

 				Name="VCXMLDataGeneratorTool"

@@ -114,7 +122,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"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

@@ -168,9 +176,13 @@
 			>

 			<Tool

 				Name="VCPreBuildEventTool"

+				CommandLine=""

+				ExcludedFromBuild="false"

 			/>

 			<Tool

 				Name="VCCustomBuildTool"

+				CommandLine=""

+				Outputs=""

 			/>

 			<Tool

 				Name="VCXMLDataGeneratorTool"

@@ -185,7 +197,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"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -239,9 +251,13 @@
 			>

 			<Tool

 				Name="VCPreBuildEventTool"

+				CommandLine=""

+				ExcludedFromBuild="false"

 			/>

 			<Tool

 				Name="VCCustomBuildTool"

+				CommandLine=""

+				Outputs=""

 			/>

 			<Tool

 				Name="VCXMLDataGeneratorTool"

@@ -256,7 +272,7 @@
 				Name="VCCLCompilerTool"

 				AdditionalOptions="/Zm1000 "

 				InlineFunctionExpansion="1"

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

 				StringPooling="true"

 				RuntimeLibrary="0"

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

@@ -375,6 +395,10 @@
 				>

 			</File>

 			<File

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

+				>

+			</File>

+			<File

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

 				>

 			</File>

@@ -399,10 +423,6 @@
 				>

 			</File>

 			<File

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

-				>

-			</File>

-			<File

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

 				>

 			</File>

@@ -451,6 +471,10 @@
 				>

 			</File>

 			<File

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

+				>

+			</File>

+			<File

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

 				>

 			</File>

@@ -467,15 +491,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

@@ -510,7 +538,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

@@ -518,7 +546,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

@@ -526,7 +554,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 +562,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>

@@ -859,6 +887,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>

@@ -911,10 +1003,6 @@
 				>

 			</File>

 			<File

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

-				>

-			</File>

-			<File

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

 				>

 			</File>

@@ -1151,6 +1239,10 @@
 				>

 			</File>

 			<File

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

+				>

+			</File>

+			<File

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

 				>

 			</File>

@@ -1172,10 +1264,6 @@
 				>

 			</File>

 			<File

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

-				>

-			</File>

-			<File

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

 				>

 			</File>

@@ -1200,10 +1288,6 @@
 				>

 			</File>

 			<File

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

-				>

-			</File>

-			<File

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

 				>

 			</File>

@@ -1248,6 +1332,10 @@
 				>

 			</File>

 			<File

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

+				>

+			</File>

+			<File

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

 				>

 			</File>

@@ -1324,6 +1412,10 @@
 				>

 			</File>

 			<File

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

+				>

+			</File>

+			<File

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

 				>

 			</File>

@@ -1360,22 +1452,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>

@@ -1464,18 +1540,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>

@@ -1672,10 +1740,6 @@
 				>

 			</File>

 			<File

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

-				>

-			</File>

-			<File

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

 				>

 			</File>

@@ -1732,14 +1796,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>

@@ -1760,10 +2056,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>

@@ -1784,10 +2176,6 @@
 				>

 			</File>

 			<File

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

-				>

-			</File>

-			<File

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

 				>

 			</File>

@@ -1812,6 +2200,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>

@@ -1896,11 +2332,11 @@
 				>

 			</File>

 			<File

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

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

 				>

 			</File>

 			<File

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

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

 				>

 			</File>

 			<File