diff --git a/Mesa.dsw b/Mesa.dsw index 9d834ccccfb..81880181c4e 100644 --- a/Mesa.dsw +++ b/Mesa.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### -Project: "array_cache"=".\SRC\MESA\array_cache\array_cache.dsp" - Package Owner=<4> +Project: "array_cache"=.\SRC\MESA\array_cache\array_cache.dsp - Package Owner=<4> Package=<5> {{{ @@ -15,7 +15,7 @@ Package=<4> ############################################################################### -Project: "gdi"=".\src\mesa\drivers\windows\gdi\gdi.dsp" - Package Owner=<4> +Project: "gdi"=.\src\mesa\drivers\windows\gdi\gdi.dsp - Package Owner=<4> Package=<5> {{{ @@ -44,11 +44,14 @@ Package=<4> Begin Project Dependency Project_Dep_Name glapi End Project Dependency + Begin Project Dependency + Project_Dep_Name shader + End Project Dependency }}} ############################################################################### -Project: "glapi"=".\SRC\MESA\glapi\glapi.dsp" - Package Owner=<4> +Project: "glapi"=.\SRC\MESA\glapi\glapi.dsp - Package Owner=<4> Package=<5> {{{ @@ -60,7 +63,7 @@ Package=<4> ############################################################################### -Project: "glu"=".\src\glu\sgi\glu.dsp" - Package Owner=<4> +Project: "glu"=.\src\glu\sgi\glu.dsp - Package Owner=<4> Package=<5> {{{ @@ -75,7 +78,7 @@ Package=<4> ############################################################################### -Project: "glut"=".\src\glut\glx\glut.dsp" - Package Owner=<4> +Project: "glut"=.\src\glut\glx\glut.dsp - Package Owner=<4> Package=<5> {{{ @@ -90,7 +93,7 @@ Package=<4> ############################################################################### -Project: "main"=".\SRC\MESA\main\main.dsp" - Package Owner=<4> +Project: "main"=.\SRC\MESA\main\main.dsp - Package Owner=<4> Package=<5> {{{ @@ -102,7 +105,7 @@ Package=<4> ############################################################################### -Project: "math"=".\SRC\MESA\math\math.dsp" - Package Owner=<4> +Project: "math"=.\SRC\MESA\math\math.dsp - Package Owner=<4> Package=<5> {{{ @@ -114,7 +117,7 @@ Package=<4> ############################################################################### -Project: "osmesa"=".\SRC\MESA\DRIVERS\osmesa\osmesa.dsp" - Package Owner=<4> +Project: "osmesa"=.\SRC\MESA\DRIVERS\osmesa\osmesa.dsp - Package Owner=<4> Package=<5> {{{ @@ -129,7 +132,7 @@ Package=<4> ############################################################################### -Project: "swrast"=".\SRC\MESA\swrast\swrast.dsp" - Package Owner=<4> +Project: "shader"=.\SRC\MESA\shader\shader.dsp - Package Owner=<4> Package=<5> {{{ @@ -141,7 +144,7 @@ Package=<4> ############################################################################### -Project: "swrast_setup"=".\SRC\MESA\swrast_setup\swrast_setup.dsp" - Package Owner=<4> +Project: "swrast"=.\SRC\MESA\swrast\swrast.dsp - Package Owner=<4> Package=<5> {{{ @@ -153,7 +156,19 @@ Package=<4> ############################################################################### -Project: "tnl"=".\SRC\MESA\tnl\tnl.dsp" - Package Owner=<4> +Project: "swrast_setup"=.\SRC\MESA\swrast_setup\swrast_setup.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "tnl"=.\SRC\MESA\tnl\tnl.dsp - Package Owner=<4> Package=<5> {{{ diff --git a/src/mesa/drivers/windows/gdi/gdi.dsp b/src/mesa/drivers/windows/gdi/gdi.dsp index 9981b0c334a..886cbd6471b 100644 --- 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 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /YX /FD /c -# 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 +# 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 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -74,7 +74,7 @@ PostBuild_Cmds=if not exist ..\..\..\..\..\lib md ..\..\..\..\..\lib copy Releas # 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 "GDI_EXPORTS" /YX /FD /GZ /c -# 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 +# 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 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" diff --git a/src/mesa/main/main.dsp b/src/mesa/main/main.dsp index 201dcbcc351..b7be0f33608 100644 --- a/src/mesa/main/main.dsp +++ b/src/mesa/main/main.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "../../../include" /I "../" /I "../glapi" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /Zm1000 /c +# 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 # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -64,7 +64,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# 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 +# 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 # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -105,22 +105,6 @@ SOURCE=.\api_validate.c # End Source File # Begin Source File -SOURCE=.\arbfragparse.c -# End Source File -# Begin Source File - -SOURCE=.\arbparse.c -# End Source File -# Begin Source File - -SOURCE=.\arbprogram.c -# End Source File -# Begin Source File - -SOURCE=.\arbvertparse.c -# End Source File -# Begin Source File - SOURCE=.\attrib.c # End Source File # Begin Source File @@ -233,22 +217,6 @@ SOURCE=.\matrix.c # End Source File # Begin Source File -SOURCE=.\nvfragparse.c -# End Source File -# Begin Source File - -SOURCE=.\nvprogram.c -# End Source File -# Begin Source File - -SOURCE=.\nvvertexec.c -# End Source File -# Begin Source File - -SOURCE=.\nvvertparse.c -# End Source File -# Begin Source File - SOURCE=.\occlude.c # End Source File # Begin Source File @@ -265,10 +233,6 @@ SOURCE=.\polygon.c # End Source File # Begin Source File -SOURCE=.\program.c -# End Source File -# Begin Source File - SOURCE=.\rastpos.c # End Source File # Begin Source File @@ -285,6 +249,14 @@ SOURCE=.\texcompress.c # End Source File # Begin Source File +SOURCE=.\texcompress_fxt1.c +# End Source File +# Begin Source File + +SOURCE=.\texcompress_s3tc.c +# End Source File +# Begin Source File + SOURCE=.\texformat.c # End Source File # Begin Source File @@ -305,10 +277,6 @@ SOURCE=.\texstore.c # End Source File # Begin Source File -SOURCE=.\texutil.c -# End Source File -# Begin Source File - SOURCE=.\varray.c # End Source File # Begin Source File diff --git a/src/mesa/swrast/swrast.dsp b/src/mesa/swrast/swrast.dsp index a59ce35b3b9..e483eb85f5f 100644 --- a/src/mesa/swrast/swrast.dsp +++ b/src/mesa/swrast/swrast.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "../../../include" /I "../" /I "../main" /I "../glapi" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# 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 # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -64,7 +64,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# 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 +# 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 # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -105,6 +105,10 @@ SOURCE=.\s_alphabuf.c # End Source File # Begin Source File +SOURCE=.\s_auxbuffer.c +# End Source File +# Begin Source File + SOURCE=.\s_bitmap.c # End Source File # Begin Source File diff --git a/src/mesa/tnl/tnl.dsp b/src/mesa/tnl/tnl.dsp index bdfee20bd30..0499d12658e 100644 --- a/src/mesa/tnl/tnl.dsp +++ b/src/mesa/tnl/tnl.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "../../../include" /I "../" /I "../main" /I "../glapi" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# 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 # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -64,7 +64,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# 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 +# 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 # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -113,6 +113,10 @@ SOURCE=.\t_save_playback.c # End Source File # Begin Source File +SOURCE=.\t_vb_cull.c +# End Source File +# Begin Source File + SOURCE=.\t_vb_fog.c # End Source File # Begin Source File @@ -153,6 +157,14 @@ SOURCE=.\t_vertex.c # End Source File # Begin Source File +SOURCE=.\t_vertex_c.c +# End Source File +# Begin Source File + +SOURCE=.\t_vertex_codegen.c +# End Source File +# Begin Source File + SOURCE=.\t_vtx_api.c # End Source File # Begin Source File @@ -163,6 +175,10 @@ SOURCE=.\t_vtx_eval.c SOURCE=.\t_vtx_exec.c # End Source File +# Begin Source File + +SOURCE=.\t_vtx_generic.c +# End Source File # End Group # Begin Group "Header Files"