Update Visual Studio Project file for src tree updates.

diff --git a/Mesa.dsw b/Mesa.dsw
index 9d834ccccfb4ad2ec4d35d10d0e44a7a038082f6..81880181c4e2d212fe22c2b9131f0e4919b82f58 100644 (file)
--- a/Mesa.dsw
+++ b/Mesa.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 \r
 ###############################################################################\r
 \r
-Project: "array_cache"=".\SRC\MESA\array_cache\array_cache.dsp" - Package Owner=<4>\r
+Project: "array_cache"=.\SRC\MESA\array_cache\array_cache.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -15,7 +15,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "gdi"=".\src\mesa\drivers\windows\gdi\gdi.dsp" - Package Owner=<4>\r
+Project: "gdi"=.\src\mesa\drivers\windows\gdi\gdi.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -44,11 +44,14 @@ Package=<4>
     Begin Project Dependency\r
     Project_Dep_Name glapi\r
     End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name shader\r
+    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
 \r
-Project: "glapi"=".\SRC\MESA\glapi\glapi.dsp" - Package Owner=<4>\r
+Project: "glapi"=.\SRC\MESA\glapi\glapi.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -60,7 +63,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "glu"=".\src\glu\sgi\glu.dsp" - Package Owner=<4>\r
+Project: "glu"=.\src\glu\sgi\glu.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -75,7 +78,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "glut"=".\src\glut\glx\glut.dsp" - Package Owner=<4>\r
+Project: "glut"=.\src\glut\glx\glut.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -90,7 +93,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "main"=".\SRC\MESA\main\main.dsp" - Package Owner=<4>\r
+Project: "main"=.\SRC\MESA\main\main.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -102,7 +105,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "math"=".\SRC\MESA\math\math.dsp" - Package Owner=<4>\r
+Project: "math"=.\SRC\MESA\math\math.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -114,7 +117,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "osmesa"=".\SRC\MESA\DRIVERS\osmesa\osmesa.dsp" - Package Owner=<4>\r
+Project: "osmesa"=.\SRC\MESA\DRIVERS\osmesa\osmesa.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -129,7 +132,19 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "swrast"=".\SRC\MESA\swrast\swrast.dsp" - Package Owner=<4>\r
+Project: "shader"=.\SRC\MESA\shader\shader.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "swrast"=.\SRC\MESA\swrast\swrast.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -141,7 +156,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "swrast_setup"=".\SRC\MESA\swrast_setup\swrast_setup.dsp" - Package Owner=<4>\r
+Project: "swrast_setup"=.\SRC\MESA\swrast_setup\swrast_setup.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -153,7 +168,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "tnl"=".\SRC\MESA\tnl\tnl.dsp" - Package Owner=<4>\r
+Project: "tnl"=.\SRC\MESA\tnl\tnl.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r

diff --git a/src/mesa/drivers/windows/gdi/gdi.dsp b/src/mesa/drivers/windows/gdi/gdi.dsp
index 9981b0c334ae84bd36bd9b945a5b9de755aac6d3..886cbd6471bc96bdd6f50fafbfc1ba17cbebe0b3 100644 (file)
--- a/src/mesa/drivers/windows/gdi/gdi.dsp
+++ b/src/mesa/drivers/windows/gdi/gdi.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../../../src/mesa/main" /I "../../../../../src/mesa/glapi" /I "../../../../../src/mesa/math" /I "../../../../../src/mesa/transform" /I "../../../../../src/mesa/swrast" /I "../../../../../src/mesa/swrast_setup" /I "../../../../../include" /I "../../../../../src/mesa" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /D "BUILD_GL32" /YX /FD /c\r
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../../../src/mesa/main" /I "../../../../../src/mesa/glapi" /I "../../../../../src/mesa/math" /I "../../../../../src/mesa/transform" /I "../../../../../src/mesa/swrast" /I "../../../../../src/mesa/swrast_setup" /I "../../../../../include" /I "../../../../../src/mesa" /I "../../../../../src/mesa/shader" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /D "BUILD_GL32" /YX /FD /c\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
@@ -74,7 +74,7 @@ PostBuild_Cmds=if not exist ..\..\..\..\..\lib md ..\..\..\..\..\lib  copy Releas
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../../src/mesa/main" /I "../../../../../src/mesa/glapi" /I "../../../../../src/mesa/math" /I "../../../../../src/mesa/transform" /I "../../../../../src/mesa/swrast" /I "../../../../../src/mesa/swrast_setup" /I "../../../../../include" /I "../../../../../src/mesa" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /D "BUILD_GL32" /FR /YX /FD /GZ /c\r
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../../src/mesa/main" /I "../../../../../src/mesa/glapi" /I "../../../../../src/mesa/math" /I "../../../../../src/mesa/transform" /I "../../../../../src/mesa/swrast" /I "../../../../../src/mesa/swrast_setup" /I "../../../../../include" /I "../../../../../src/mesa" /I "../../../../../src/mesa/shader" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /D "BUILD_GL32" /FR /YX /FD /GZ /c\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r

diff --git a/src/mesa/main/main.dsp b/src/mesa/main/main.dsp
index 201dcbcc3511118baae8a5fccf74d74b1c7460da..b7be0f33608d2dcf07e2bb24d1e010b5d8e30917 100644 (file)
--- a/src/mesa/main/main.dsp
+++ b/src/mesa/main/main.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
-# ADD CPP /nologo /W3 /GX /O2 /I "../../../include" /I "../" /I "../glapi" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /Zm1000 /c\r
+# ADD CPP /nologo /W3 /GX /O2 /I "../../../include" /I "../" /I "../glapi" /I "../shader" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /Zm1000 /c\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
@@ -64,7 +64,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c\r
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../" /I "../glapi" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /Zm1000 /c\r
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../" /I "../glapi" /I "../shader" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /Zm1000 /c\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
@@ -105,22 +105,6 @@ SOURCE=.\api_validate.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\arbfragparse.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\arbparse.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\arbprogram.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\arbvertparse.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\attrib.c\r
 # End Source File\r
 # Begin Source File\r
@@ -233,22 +217,6 @@ SOURCE=.\matrix.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\nvfragparse.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\nvprogram.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\nvvertexec.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\nvvertparse.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\occlude.c\r
 # End Source File\r
 # Begin Source File\r
@@ -265,10 +233,6 @@ SOURCE=.\polygon.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\program.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\rastpos.c\r
 # End Source File\r
 # Begin Source File\r
@@ -285,6 +249,14 @@ SOURCE=.\texcompress.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\texcompress_fxt1.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\texcompress_s3tc.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\texformat.c\r
 # End Source File\r
 # Begin Source File\r
@@ -305,10 +277,6 @@ SOURCE=.\texstore.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\texutil.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\varray.c\r
 # End Source File\r
 # Begin Source File\r

diff --git a/src/mesa/swrast/swrast.dsp b/src/mesa/swrast/swrast.dsp
index a59ce35b3b9649a71ed928a0c3fda9ad7b070fa1..e483eb85f5f3ee6b0561a922c7e691f46e205820 100644 (file)
--- a/src/mesa/swrast/swrast.dsp
+++ b/src/mesa/swrast/swrast.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
-# ADD CPP /nologo /W3 /GX /O2 /I "../../../include" /I "../" /I "../main" /I "../glapi" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
+# ADD CPP /nologo /W3 /GX /O2 /I "../../../include" /I "../" /I "../main" /I "../glapi" /I "../shader" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
@@ -64,7 +64,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c\r
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../" /I "../main" /I "../glapi" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c\r
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../" /I "../main" /I "../glapi" /I "../shader" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
@@ -105,6 +105,10 @@ SOURCE=.\s_alphabuf.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\s_auxbuffer.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\s_bitmap.c\r
 # End Source File\r
 # Begin Source File\r

diff --git a/src/mesa/tnl/tnl.dsp b/src/mesa/tnl/tnl.dsp
index bdfee20bd304bce0b7a60eb78e1e3f3c03badd25..0499d12658e3fa62a09dd84fee4524f1286b107e 100644 (file)
--- a/src/mesa/tnl/tnl.dsp
+++ b/src/mesa/tnl/tnl.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
-# ADD CPP /nologo /W3 /GX /O2 /I "../../../include" /I "../" /I "../main" /I "../glapi" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
+# ADD CPP /nologo /W3 /GX /O2 /I "../../../include" /I "../" /I "../main" /I "../glapi" /I "../shader" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
@@ -64,7 +64,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c\r
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../" /I "../main" /I "../glapi" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c\r
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../" /I "../main" /I "../glapi" /I "../shader" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
@@ -113,6 +113,10 @@ SOURCE=.\t_save_playback.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\t_vb_cull.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\t_vb_fog.c\r
 # End Source File\r
 # Begin Source File\r
@@ -153,6 +157,14 @@ SOURCE=.\t_vertex.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\t_vertex_c.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\t_vertex_codegen.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\t_vtx_api.c\r
 # End Source File\r
 # Begin Source File\r
@@ -163,6 +175,10 @@ SOURCE=.\t_vtx_eval.c
 \r
 SOURCE=.\t_vtx_exec.c\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\t_vtx_generic.c\r
+# End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
 \r