Merge branch 'mesa_7_6_branch' of git://anongit.freedesktop.org/mesa/mesa into debian-unstable

Conflicts:
	progs/fp/Makefile
	progs/fp/fp-tri.c
	progs/fp/point-position.c
	progs/fp/tri-depth.c
	progs/fp/tri-depth2.c
	progs/fp/tri-depthwrite.c
	progs/fp/tri-depthwrite2.c
	progs/fp/tri-inv.c
	progs/fp/tri-param.c
	progs/fp/tri-tex.c
	progs/tests/Makefile
	progs/tests/SConscript
	progs/tests/arraytexture.c
	progs/tests/copypixrate.c
	progs/tests/crossbar.c
	progs/tests/drawbuffers.c
	progs/tests/invert.c
	progs/tests/minmag.c
	progs/tests/mipmap_comp.c
	progs/tests/prog_parameter.c
	progs/tests/random.c
	progs/tests/shader_api.c
	progs/tests/stencil_twoside.c
	progs/tests/texcmp.c
	progs/tests/texdown.c
	progs/tests/vao-01.c
	progs/tests/vao-02.c
	progs/trivial/clear-fbo-tex.c
	progs/trivial/clear-fbo.c
	progs/trivial/clear-random.c
	progs/trivial/clear-scissor.c
	progs/trivial/clear.c
	progs/trivial/createwin.c
	progs/trivial/dlist-begin-call-end.c
	progs/trivial/dlist-dangling.c
	progs/trivial/dlist-edgeflag-dangling.c
	progs/trivial/dlist-edgeflag.c
	progs/trivial/dlist-flat-tri.c
	progs/trivial/dlist-mat-tri.c
	progs/trivial/dlist-recursive-call.c
	progs/trivial/dlist-tri-flat-tri.c
	progs/trivial/dlist-tri-mat-tri.c
	progs/trivial/line-clip.c
	progs/trivial/line-cull.c
	progs/trivial/line-flat.c
	progs/trivial/line-stipple-wide.c
	progs/trivial/line-userclip-clip.c
	progs/trivial/line-userclip-nop-clip.c
	progs/trivial/line-userclip-nop.c
	progs/trivial/line-userclip.c
	progs/trivial/line-wide.c
	progs/trivial/line.c
	progs/trivial/lineloop-clip.c
	progs/trivial/lineloop.c
	progs/trivial/linestrip-clip.c
	progs/trivial/linestrip-flat-stipple.c
	progs/trivial/linestrip-stipple-wide.c
	progs/trivial/linestrip-stipple.c
	progs/trivial/linestrip.c
	progs/trivial/point-clip.c
	progs/trivial/point-param.c
	progs/trivial/point-sprite.c
	progs/trivial/point-wide-smooth.c
	progs/trivial/point-wide.c
	progs/trivial/point.c
	progs/trivial/poly-flat-clip.c
	progs/trivial/poly-flat-unfilled-clip.c
	progs/trivial/poly-flat.c
	progs/trivial/poly-unfilled.c
	progs/trivial/poly.c
	progs/trivial/quad-clip-all-vertices.c
	progs/trivial/quad-clip.c
	progs/trivial/quad-degenerate.c
	progs/trivial/quad-flat.c
	progs/trivial/quad-offset-factor.c
	progs/trivial/quad-offset-unfilled.c
	progs/trivial/quad-offset-units.c
	progs/trivial/quad-tex-alpha.c
	progs/trivial/quad-tex-pbo.c
	progs/trivial/quad-unfilled-clip.c
	progs/trivial/quad-unfilled-stipple.c
	progs/trivial/quad-unfilled.c
	progs/trivial/quad.c
	progs/trivial/quads.c
	progs/trivial/quadstrip-cont.c
	progs/trivial/quadstrip-flat.c
	progs/trivial/quadstrip.c
	progs/trivial/readpixels.c
	progs/trivial/tri-alpha-tex.c
	progs/trivial/tri-alpha.c
	progs/trivial/tri-blend-color.c
	progs/trivial/tri-clear.c
	progs/trivial/tri-clip.c
	progs/trivial/tri-cull-both.c
	progs/trivial/tri-dlist.c
	progs/trivial/tri-fbo.c
	progs/trivial/tri-flat-clip.c
	progs/trivial/tri-flat.c
	progs/trivial/tri-fog.c
	progs/trivial/tri-fp-const-imm.c
	progs/trivial/tri-fp.c
	progs/trivial/tri-lit-material.c
	progs/trivial/tri-lit.c
	progs/trivial/tri-multitex-vbo.c
	progs/trivial/tri-orig.c
	progs/trivial/tri-query.c
	progs/trivial/tri-scissor-tri.c
	progs/trivial/tri-square.c
	progs/trivial/tri-stipple.c
	progs/trivial/tri-tex-3d.c
	progs/trivial/tri-tex.c
	progs/trivial/tri-tri.c
	progs/trivial/tri-unfilled-clip.c
	progs/trivial/tri-unfilled-edgeflag.c
	progs/trivial/tri-unfilled-point.c
	progs/trivial/tri-unfilled-smooth.c
	progs/trivial/tri-unfilled-tri-lit.c
	progs/trivial/tri-unfilled-tri.c
	progs/trivial/tri-unfilled-userclip-stip.c
	progs/trivial/tri-unfilled-userclip.c
	progs/trivial/tri-unfilled.c
	progs/trivial/tri-userclip.c
	progs/trivial/tri-z-9.c
	progs/trivial/tri-z-eq.c
	progs/trivial/trifan-flat-clip.c
	progs/trivial/trifan-flat-unfilled-clip.c
	progs/trivial/trifan-flat.c
	progs/trivial/trifan-unfilled.c
	progs/trivial/trifan.c
	progs/trivial/tristrip-clip.c
	progs/trivial/tristrip-flat.c
	progs/trivial/tristrip.c
	progs/trivial/vp-tri-cb-pos.c
	progs/trivial/vp-tri-cb-tex.c
	progs/trivial/vp-tri-invariant.c
	progs/vp/vp-tris.c
	progs/vpglsl/psiz-mul.glsl
	progs/vpglsl/vp-tris.c

2 files changed, 103 insertions, 432 deletions

diff --git a/windows/VC6/progs/glut/glut.dsp b/windows/VC6/progs/glut/glut.dsp
deleted file mode 100644
index 0a67689d786..00000000000
--- a/windows/VC6/progs/glut/glut.dsp
+++ /dev/null
@@ -1,333 +0,0 @@
-# Microsoft Developer Studio Project File - Name="glut" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-CFG=glut - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "glut.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "glut.mak" CFG="glut - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "glut - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "glut - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "glut - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLUT_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_DLL" /D "_USRDLL" /D "GLUT_EXPORTS" /D "MESA" /D "BUILD_GL32" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 opengl32.lib glu32.lib winmm.lib msvcrt.lib oldnames.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release/GLUT32.DLL" /libpath:"../../mesa/Release"

-# Begin Special Build Tool

-SOURCE="$(InputPath)"

-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib	copy Release\GLUT32.LIB ..\..\..\..\lib	copy Release\GLUT32.DLL ..\..\..\..\lib	if exist ..\..\..\..\progs\demos copy Release\GLUT32.DLL ..\..\..\..\progs\demos

-# End Special Build Tool

-

-!ELSEIF  "$(CFG)" == "glut - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLUT_EXPORTS" /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_DLL" /D "_USRDLL" /D "GLUT_EXPORTS" /D "MESA" /D "BUILD_GL32" /FD /GZ /c

-# SUBTRACT CPP /YX

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 winmm.lib msvcrtd.lib oldnames.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib /out:"Debug/GLUT32.DLL" /pdbtype:sept /libpath:"../../mesa/Debug"

-# Begin Special Build Tool

-SOURCE="$(InputPath)"

-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib	copy Debug\GLUT32.LIB ..\..\..\..\lib	copy Debug\GLUT32.DLL ..\..\..\..\lib	if exist ..\..\..\..\progs\demos copy Debug\GLUT32.DLL ..\..\..\..\progs\demos

-# End Special Build Tool

-

-!ENDIF 

-

-# Begin Target

-

-# Name "glut - Win32 Release"

-# Name "glut - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_8x13.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_9x15.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_bitmap.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_bwidth.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_cindex.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_cmap.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_cursor.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_dials.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_dstr.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_event.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_ext.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_fcb.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_fullscrn.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_gamemode.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_get.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_hel10.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_hel12.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_hel18.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_init.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_input.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_joy.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_key.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_keyctrl.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_keyup.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_mesa.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_modifier.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_mroman.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_overlay.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_roman.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_shapes.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_space.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_stroke.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_swap.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_swidth.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_tablet.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_teapot.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_tr10.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_tr24.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_util.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_vidresize.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_warp.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_win.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glut_winmisc.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\win32_glx.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\win32_menu.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\win32_util.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\win32_winproc.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\win32_x11.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glutbitmap.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glutint.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glutstroke.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\glutwin32.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\stroke.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\win32_glx.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\..\src\glut\glx\win32_x11.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/windows/VC8/mesa/mesa/mesa.vcproj b/windows/VC8/mesa/mesa/mesa.vcproj
index 068da1612d4..547483d9825 100644
--- a/windows/VC8/mesa/mesa/mesa.vcproj
+++ b/windows/VC8/mesa/mesa/mesa.vcproj
@@ -122,7 +122,7 @@
 				WarningLevel="3"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="3"

-				CompileAs="0"

+				CompileAs="1"

 				ForcedIncludeFiles="../../../../src/mesa/main/compiler.h"

 			/>

 			<Tool

@@ -475,102 +475,70 @@
 				>

 			</File>

 			<File

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

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

 				>

-				<FileConfiguration

-					Name="Release|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Static CRT|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Static CRT|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

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

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

+				>

+			</File>

+			<File

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

+				>

+			</File>

+			<File

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

+				>

+			</File>

+			<File

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

+				>

+			</File>

+			<File

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

+				>

+			</File>

+			<File

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

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\mesa\shader\lex.yy.c"

 				>

 				<FileConfiguration

 					Name="Release|Win32"

-					ExcludedFromBuild="true"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

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

 					/>

 				</FileConfiguration>

 				<FileConfiguration

 					Name="Debug|Win32"

-					ExcludedFromBuild="true"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

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

 					/>

 				</FileConfiguration>

 				<FileConfiguration

 					Name="Debug Static CRT|Win32"

-					ExcludedFromBuild="true"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

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

 					/>

 				</FileConfiguration>

 				<FileConfiguration

 					Name="Release Static CRT|Win32"

-					ExcludedFromBuild="true"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

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

 					/>

 				</FileConfiguration>

 			</File>

 			<File

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

-				>

-			</File>

-			<File

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

-				>

-			</File>

-			<File

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

-				>

-			</File>

-			<File

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

-				>

-			</File>

-			<File

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

-				>

-			</File>

-			<File

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

-				>

-			</File>

-			<File

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

 				>

 			</File>

@@ -679,6 +647,10 @@
 				>

 			</File>

 			<File

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

+				>

+			</File>

+			<File

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

 				>

 			</File>

@@ -695,6 +667,46 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\..\src\mesa\shader\program_parse.tab.c"

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="YYMALLOC=malloc;YYFREE=free"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="YYMALLOC=malloc;YYFREE=free"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug Static CRT|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="YYMALLOC=malloc;YYFREE=free"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release Static CRT|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						PreprocessorDefinitions="YYMALLOC=malloc;YYFREE=free"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

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

+				>

+			</File>

+			<File

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

 				>

 			</File>

@@ -947,6 +959,14 @@
 				>

 			</File>

 			<File

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

+				>

+			</File>

+			<File

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

+				>

+			</File>

+			<File

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

 				>

 			</File>

@@ -1135,42 +1155,6 @@
 				>

 			</File>

 			<File

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

-				>

-				<FileConfiguration

-					Name="Release|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Static CRT|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Static CRT|Win32"

-					ExcludedFromBuild="true"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

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

 				>

 			</File>

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

 			</File>

 			<File

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

+				>

+			</File>

+			<File

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

 				>

 			</File>

@@ -1556,6 +1544,10 @@
 				>

 			</File>

 			<File

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

+				>

+			</File>

+			<File

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

 				>

 			</File>

@@ -1572,6 +1564,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\..\src\mesa\shader\program_parse.tab.h"

+				>

+			</File>

+			<File

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

 				>

 			</File>

@@ -1844,6 +1840,14 @@
 				>

 			</File>

 			<File

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

+				>

+			</File>

+			<File

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

+				>

+			</File>

+			<File

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

 				>

 			</File>