Assorted Windows fixes (Karl Schultz)

3 files changed, 968 insertions, 430 deletions

diff --git a/windows/VC7/mesa/mesa/mesa.vcproj b/windows/VC7/mesa/mesa/mesa.vcproj
index 8a682585cd..acbbf18cb4 100644
--- a/windows/VC7/mesa/mesa/mesa.vcproj
+++ b/windows/VC7/mesa/mesa/mesa.vcproj
@@ -1,75 +1,118 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8.00"

 	Name="mesa"

-	SccProjectName=""

-	SccLocalPath="">

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

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory=".\Release"

 			IntermediateDirectory=".\Release"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				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"

 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,_DLL,BUILD_GL32,MESA_MINWARN"

-				StringPooling="TRUE"

-				RuntimeLibrary="4"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\Release/mesa.pch"

 				AssemblerListingLocation=".\Release/"

 				ObjectFile=".\Release/"

 				ProgramDataBaseFileName=".\Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile=".\Release\mesa.lib"

-				SuppressStartupBanner="TRUE"/>

-			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile=".\Release\mesa.lib"

+				SuppressStartupBanner="true"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

 			OutputDirectory=".\Debug"

 			IntermediateDirectory=".\Debug"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/Zm1000 "

@@ -77,42 +120,48 @@
 				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang,../../../../src/mesa/shader/grammar"

 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB,_DLL,BUILD_GL32,MESA_MINWARN"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

+				RuntimeLibrary="1"

 				PrecompiledHeaderFile=".\Debug/mesa.pch"

 				AssemblerListingLocation=".\Debug/"

 				ObjectFile=".\Debug/"

 				ProgramDataBaseFileName=".\Debug/"

 				BrowseInformation="1"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="3"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile=".\Debug\mesa.lib"

-				SuppressStartupBanner="TRUE"/>

+				CompileAs="0"

+			/>

 			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile=".\Debug\mesa.lib"

+				SuppressStartupBanner="true"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -120,1105 +169,1590 @@
 	<Files>

 		<Filter

 			Name="Source Files"

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

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

+			>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\accum.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\api_arrayelt.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\api_loopback.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\api_noop.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\api_validate.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\arbprogparse.c">

+				RelativePath="..\..\..\..\src\mesa\shader\arbprogparse.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\arbprogram.c">

+				RelativePath="..\..\..\..\src\mesa\shader\arbprogram.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\arrayobj.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\atifragshader.c">

+				RelativePath="..\..\..\..\src\mesa\shader\atifragshader.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\attrib.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\blend.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\bufferobj.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\buffers.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\clip.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\colortab.c">

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

+				>

 			</File>

 			<File

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

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\convolve.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\debug.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\depth.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\depthstencil.c">

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

+				>

 			</File>

 			<File

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

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

+				>

 			</File>

 			<File

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

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\drawpix.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\enable.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\enums.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\eval.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\execmem.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\extensions.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\fbobject.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\feedback.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\fog.c">

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

+				>

 			</File>

 			<File

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

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\get.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\getstring.c">

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

+				>

 			</File>

 			<File

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

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

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

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

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

+				>

 			</File>

 			<File

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

+				RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar.c"

+				>

 				<FileConfiguration

 					Name="Release|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

 					Name="Debug|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_crt.c">

+				RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_crt.c"

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

+					/>

+				</FileConfiguration>

 				<FileConfiguration

 					Name="Debug|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

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

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\hash.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\hint.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\histogram.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\image.c">

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

+				>

+			</File>

+			<File

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

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\imports.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\light.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\lines.c">

+				RelativePath="..\..\..\..\src\mesa\math\m_debug_clip.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\math\m_debug_clip.c">

+				RelativePath="..\..\..\..\src\mesa\math\m_debug_norm.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\math\m_debug_norm.c">

+				RelativePath="..\..\..\..\src\mesa\math\m_debug_xform.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\math\m_debug_xform.c">

+				RelativePath="..\..\..\..\src\mesa\math\m_eval.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\math\m_eval.c">

+				RelativePath="..\..\..\..\src\mesa\math\m_matrix.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\math\m_matrix.c">

+				RelativePath="..\..\..\..\src\mesa\math\m_translate.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\math\m_translate.c">

+				RelativePath="..\..\..\..\src\mesa\math\m_vector.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\math\m_vector.c">

+				RelativePath="..\..\..\..\src\mesa\math\m_xform.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\math\m_xform.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\matrix.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\mipmap.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\mm.c">

+				RelativePath="..\..\..\..\src\mesa\shader\nvfragparse.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\nvfragparse.c">

+				RelativePath="..\..\..\..\src\mesa\shader\nvprogram.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\nvprogram.c">

+				RelativePath="..\..\..\..\src\mesa\shader\nvvertparse.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\nvvertparse.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\pixel.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\points.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\polygon.c">

+				RelativePath="..\..\..\..\src\mesa\shader\prog_debug.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\prog_debug.c">

+				RelativePath="..\..\..\..\src\mesa\shader\prog_execute.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\prog_execute.c">

+				RelativePath="..\..\..\..\src\mesa\shader\prog_instruction.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\prog_instruction.c">

+				RelativePath="..\..\..\..\src\mesa\shader\prog_parameter.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\prog_parameter.c">

+				RelativePath="..\..\..\..\src\mesa\shader\prog_print.c"

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\prog_print.c">

+				RelativePath="..\..\..\..\src\mesa\shader\prog_statevars.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\prog_statevars.c">

+				RelativePath="..\..\..\..\src\mesa\shader\prog_uniform.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\program.c">

+				RelativePath="..\..\..\..\src\mesa\shader\program.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\programopt.c">

+				RelativePath="..\..\..\..\src\mesa\shader\programopt.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\queryobj.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\rastpos.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\rbadaptors.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\renderbuffer.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_aaline.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_aaline.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_aatriangle.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_aatriangle.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_accum.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_accum.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_alpha.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_alpha.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_atifragshader.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_atifragshader.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_bitmap.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_bitmap.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_blend.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_blend.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_blit.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_blit.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_buffers.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_buffers.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_context.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_context.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_copypix.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_copypix.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_depth.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_depth.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_drawpix.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_drawpix.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_feedback.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_feedback.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_fog.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_fog.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_fragprog.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_fragprog.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_imaging.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_imaging.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_lines.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_lines.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_logic.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_logic.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_masking.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_masking.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_points.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_points.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_readpix.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_readpix.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_span.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_span.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_stencil.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_stencil.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_texcombine.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_texcombine.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_texfilter.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_texfilter.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_texstore.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_texstore.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_triangle.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_triangle.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_zoom.c">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_zoom.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\shader_api.c">

+				RelativePath="..\..\..\..\src\mesa\shader\shader_api.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\shaders.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_builtin.c">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_builtin.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_codegen.c">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_codegen.c"

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile.c">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_function.c">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_function.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_operation.c">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_operation.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_struct.c">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_struct.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_variable.c">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_variable.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_emit.c">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_emit.c"

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_ir.c">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_ir.c"

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_label.c">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_label.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_library_noise.c">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_library_noise.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_link.c">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_link.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_log.c">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_log.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_mem.c">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_mem.c"

+				>

 			</File>

 			<File

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

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

+				>

 			</File>

 			<File

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

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

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_simplify.c">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_simplify.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_storage.c">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_storage.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_typeinfo.c">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_typeinfo.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_utility.c">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_utility.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_vartable.c">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_vartable.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_context.c">

+				RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_context.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_triangle.c">

+				RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_triangle.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\state.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\stencil.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\tnl\t_context.c">

+				RelativePath="..\..\..\..\src\mesa\tnl\t_context.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\tnl\t_draw.c">

+				RelativePath="..\..\..\..\src\mesa\tnl\t_draw.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\tnl\t_pipeline.c">

+				RelativePath="..\..\..\..\src\mesa\tnl\t_pipeline.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_cull.c">

+				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_cull.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_fog.c">

+				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_fog.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_light.c">

+				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_light.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_normals.c">

+				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_normals.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_points.c">

+				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_points.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_program.c">

+				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_program.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_render.c">

+				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_render.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_texgen.c">

+				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_texgen.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_texmat.c">

+				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_texmat.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_vertex.c">

+				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_vertex.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\tnl\t_vertex.c">

+				RelativePath="..\..\..\..\src\mesa\tnl\t_vertex.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\tnl\t_vertex_generic.c">

+				RelativePath="..\..\..\..\src\mesa\tnl\t_vertex_generic.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\tnl\t_vp_build.c">

+				RelativePath="..\..\..\..\src\mesa\tnl\t_vp_build.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\texcompress.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\texcompress_fxt1.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\texcompress_s3tc.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\texenvprogram.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\texformat.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\teximage.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\texobj.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\texrender.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\texstate.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\texstore.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\varray.c">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_context.c">

+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_context.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec.c">

+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec_api.c">

+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec_api.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec_array.c">

+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec_array.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec_draw.c">

+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec_draw.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec_eval.c">

+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec_eval.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_rebase.c">

+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_rebase.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_save.c">

+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_save.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_save_api.c">

+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_save_api.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_save_draw.c">

+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_save_draw.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_save_loopback.c">

+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_save_loopback.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_split.c">

+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_split.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_split_copy.c">

+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_split_copy.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_split_inplace.c">

+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_split_inplace.c"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\vsnprintf.c">

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

+				>

 				<FileConfiguration

 					Name="Release|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

 					Name="Debug|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\vtxfmt.c">

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

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

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

-			<File

-				RelativePath="..\..\..\..\src\mesa\array_cache\ac_context.h">

-			</File>

-			<File

-				RelativePath="..\..\..\..\src\mesa\array_cache\acache.h">

-			</File>

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

+			>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\accum.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\api_arrayelt.h">

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

+				>

 			</File>

 			<File

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

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\api_loopback.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\api_noop.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\api_validate.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\arbprogparse.h">

+				RelativePath="..\..\..\..\src\mesa\shader\arbprogparse.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\arbprogram.h">

+				RelativePath="..\..\..\..\src\mesa\shader\arbprogram.h"

+				>

 			</File>

 			<File

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

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\atifragshader.h">

+				RelativePath="..\..\..\..\src\mesa\shader\atifragshader.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\attrib.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\blend.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\bufferobj.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\buffers.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\clip.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\colormac.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\colortab.h">

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

+				>

 			</File>

 			<File

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

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\context.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\convolve.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\dd.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\debug.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\depth.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\depthstencil.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\dlist.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\drawpix.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\enable.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\enums.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\eval.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\extensions.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\fbobject.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\feedback.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\fog.h">

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

+				>

 			</File>

 			<File

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

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\get.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\glapi\glapi.h">

+				RelativePath="..\..\..\..\src\mesa\glapi\glapi.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\glapi\glapioffsets.h">

+				RelativePath="..\..\..\..\src\mesa\glapi\glapioffsets.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\glapi\glapitable.h">

+				RelativePath="..\..\..\..\src\mesa\glapi\glapitable.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\glapi\glapitemp.h">

+				RelativePath="..\..\..\..\src\mesa\glapi\glapitemp.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\glheader.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\glapi\glprocs.h">

+				RelativePath="..\..\..\..\src\mesa\glapi\glprocs.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\glapi\glthread.h">

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

+				>

 			</File>

 			<File

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

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

+				>

 			</File>

 			<File

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

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

+				>

 			</File>

 			<File

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

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

+				>

 			</File>

 			<File

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

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

+				>

 			</File>

 			<File

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

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\hint.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\histogram.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\image.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\imports.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\light.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\lines.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\math\m_clip_tmp.h">

+				RelativePath="..\..\..\..\src\mesa\math\m_clip_tmp.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\math\m_copy_tmp.h">

+				RelativePath="..\..\..\..\src\mesa\math\m_copy_tmp.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\math\m_debug.h">

+				RelativePath="..\..\..\..\src\mesa\math\m_debug.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\math\m_debug_util.h">

+				RelativePath="..\..\..\..\src\mesa\math\m_debug_util.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\math\m_dotprod_tmp.h">

+				RelativePath="..\..\..\..\src\mesa\math\m_dotprod_tmp.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\math\m_eval.h">

+				RelativePath="..\..\..\..\src\mesa\math\m_eval.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\math\m_matrix.h">

+				RelativePath="..\..\..\..\src\mesa\math\m_matrix.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\math\m_norm_tmp.h">

+				RelativePath="..\..\..\..\src\mesa\math\m_norm_tmp.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\math\m_trans_tmp.h">

+				RelativePath="..\..\..\..\src\mesa\math\m_trans_tmp.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\math\m_translate.h">

+				RelativePath="..\..\..\..\src\mesa\math\m_translate.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\math\m_vector.h">

+				RelativePath="..\..\..\..\src\mesa\math\m_vector.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\math\m_xform.h">

+				RelativePath="..\..\..\..\src\mesa\math\m_xform.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\math\m_xform_tmp.h">

+				RelativePath="..\..\..\..\src\mesa\math\m_xform_tmp.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\macros.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\math\mathmod.h">

+				RelativePath="..\..\..\..\src\mesa\math\mathmod.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\matrix.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\mm.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\mtypes.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\nvfragparse.h">

+				RelativePath="..\..\..\..\src\mesa\shader\nvfragparse.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\nvprogram.h">

+				RelativePath="..\..\..\..\src\mesa\shader\nvprogram.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\nvvertexec.h">

+				RelativePath="..\..\..\..\src\mesa\shader\nvvertparse.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\nvvertparse.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\pixel.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\points.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\polygon.h">

+				RelativePath="..\..\..\..\src\mesa\shader\prog_debug.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\prog_debug.h">

+				RelativePath="..\..\..\..\src\mesa\shader\prog_execute.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\prog_execute.h">

+				RelativePath="..\..\..\..\src\mesa\shader\prog_instruction.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\prog_instruction.h">

+				RelativePath="..\..\..\..\src\mesa\shader\prog_parameter.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\prog_parameter.h">

+				RelativePath="..\..\..\..\src\mesa\shader\prog_print.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\prog_print.h">

+				RelativePath="..\..\..\..\src\mesa\shader\prog_statevars.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\prog_statevars.h">

+				RelativePath="..\..\..\..\src\mesa\shader\prog_uniform.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\program.h">

+				RelativePath="..\..\..\..\src\mesa\shader\program.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\programopt.h">

+				RelativePath="..\..\..\..\src\mesa\shader\programopt.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\queryobj.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\rastpos.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\renderbuffer.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_aaline.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_aalinetemp.h">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_aaline.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_aatriangle.h">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_aalinetemp.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_aatritemp.h">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_aatriangle.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_accum.h">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_aatritemp.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_alpha.h">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_accum.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_atifragshader.h">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_alpha.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_blend.h">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_atifragshader.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_context.h">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_blend.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_depth.h">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_context.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_drawpix.h">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_depth.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_feedback.h">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_drawpix.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_fog.h">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_feedback.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_fragprog.h">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_fog.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_lines.h">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_fragprog.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_linetemp.h">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_lines.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_logic.h">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_linetemp.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_masking.h">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_logic.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_nvfragprog.h">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_masking.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_points.h">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_points.h"

+				>

 			</File>

 			<File

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

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

+				>

 			</File>

 			<File

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

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_spantemp.h">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_spantemp.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_stencil.h">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_stencil.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_texcombine.h">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_texcombine.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_texfilter.h">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_texfilter.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_triangle.h">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_triangle.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_trispan.h">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_trispan.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_tritemp.h">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_tritemp.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast\s_zoom.h">

+				RelativePath="..\..\..\..\src\mesa\swrast\s_zoom.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\shader_api.h">

+				RelativePath="..\..\..\..\src\mesa\shader\shader_api.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\shaders.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\simple_list.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_builtin.h">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_builtin.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_codegen.h">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_codegen.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile.h">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_function.h">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_function.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_operation.h">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_operation.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_struct.h">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_struct.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_variable.h">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_variable.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_emit.h">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_emit.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_ir.h">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_ir.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_label.h">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_label.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_library_noise.h">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_library_noise.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_link.h">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_link.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_log.h">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_log.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_mem.h">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_mem.h"

+				>

 			</File>

 			<File

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

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

+				>

 			</File>

 			<File

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

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_simplify.h">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_simplify.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_storage.h">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_storage.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_typeinfo.h">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_typeinfo.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_utility.h">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_utility.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_vartable.h">

+				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_vartable.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_context.h">

+				RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_context.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_triangle.h">

+				RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_triangle.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_tritmp.h">

+				RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_tritmp.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_vb.h">

+				RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_vb.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\state.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\stencil.h">

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

+				>

 			</File>

 			<File

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

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\swrast_setup\swrast_setup.h">

+				RelativePath="..\..\..\..\src\mesa\swrast_setup\swrast_setup.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\tnl\t_context.h">

+				RelativePath="..\..\..\..\src\mesa\tnl\t_context.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\tnl\t_pipeline.h">

+				RelativePath="..\..\..\..\src\mesa\tnl\t_pipeline.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_cliptmp.h">

+				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_cliptmp.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_lighttmp.h">

+				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_lighttmp.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_rendertmp.h">

+				RelativePath="..\..\..\..\src\mesa\tnl\t_vb_rendertmp.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\tnl\t_vertex.h">

+				RelativePath="..\..\..\..\src\mesa\tnl\t_vertex.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\tnl\t_vp_build.h">

+				RelativePath="..\..\..\..\src\mesa\tnl\t_vp_build.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\texcompress.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\texenvprogram.h">

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

+				>

 			</File>

 			<File

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

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\texformat_tmp.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\teximage.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\texobj.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\texrender.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\texstate.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\texstore.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\tnl\tnl.h">

+				RelativePath="..\..\..\..\src\mesa\tnl\tnl.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\varray.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\vbo\vbo.h">

+				RelativePath="..\..\..\..\src\mesa\vbo\vbo.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_attrib.h">

+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_attrib.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_attrib_tmp.h">

+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_attrib_tmp.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_context.h">

+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_context.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec.h">

+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_save.h">

+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_save.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\vbo\vbo_split.h">

+				RelativePath="..\..\..\..\src\mesa\vbo\vbo_split.h"

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\version.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\vtxfmt.h">

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

+				>

 			</File>

 			<File

-				RelativePath="..\..\..\..\src\mesa\main\vtxfmt_tmp.h">

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

+				>

 			</File>

 		</Filter>

 	</Files>

diff --git a/windows/VC8/mesa/gdi/gdi.vcproj b/windows/VC8/mesa/gdi/gdi.vcproj
index 0aab8cf9d4..7b3efc4d88 100644
--- a/windows/VC8/mesa/gdi/gdi.vcproj
+++ b/windows/VC8/mesa/gdi/gdi.vcproj
@@ -245,6 +245,10 @@
 				>

 			</File>

 			<File

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

+				>

+			</File>

+			<File

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

 				>

 			</File>

diff --git a/windows/VC8/mesa/glu/glu.vcproj b/windows/VC8/mesa/glu/glu.vcproj
index 8679aa18ce..016b0b9716 100644
--- a/windows/VC8/mesa/glu/glu.vcproj
+++ b/windows/VC8/mesa/glu/glu.vcproj
@@ -47,7 +47,7 @@
 				Name="VCCLCompilerTool"

 				InlineFunctionExpansion="1"

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

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GL32;LIBRARYBUILD"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GL32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE"

 				StringPooling="true"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

@@ -142,7 +142,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

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

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GL32;LIBRARYBUILD"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GL32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

 				PrecompiledHeaderFile=".\Debug/glu.pch"

@@ -418,11 +418,11 @@
 				>

 			</File>

 			<File

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

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

 				>

 			</File>

 			<File

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

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

 				>

 			</File>

 			<File

@@ -518,19 +518,19 @@
 				>

 			</File>

 			<File

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

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

 				>

 			</File>

 			<File

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

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

 				>

 			</File>

 			<File

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

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

 				>

 			</File>

 			<File

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

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

 				>

 			</File>

 			<File