replace s_texture.[ch] with s_texcombine.[ch] and s_texfilter.[ch]

diff --git a/windows/VC6/mesa/mesa/mesa.dsp b/windows/VC6/mesa/mesa/mesa.dsp
index 5d8dc5b4849489293d698dcb10ef0a6f37edecd3..ce23169ab94e3d54b7dc362220418aa1eb604d8d 100644 (file)
--- a/windows/VC6/mesa/mesa/mesa.dsp
+++ b/windows/VC6/mesa/mesa/mesa.dsp
@@ -450,7 +450,11 @@ SOURCE=..\..\..\..\src\mesa\swrast\s_texstore.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\..\..\src\mesa\swrast\s_texture.c\r
+SOURCE=..\..\..\..\src\mesa\swrast\s_texcombine.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\..\src\mesa\swrast\s_texfiltere.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -1119,7 +1123,11 @@ SOURCE=..\..\..\..\src\mesa\swrast\s_stencil.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\..\..\src\mesa\swrast\s_texture.h\r
+SOURCE=..\..\..\..\src\mesa\swrast\s_texcombine.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\..\src\mesa\swrast\s_texfilter.h\r
 # End Source File\r
 # Begin Source File\r
 \r

diff --git a/windows/VC7/mesa/mesa/mesa.vcproj b/windows/VC7/mesa/mesa/mesa.vcproj
index 75bff90f448ae4ac78373f4f7aa3e27e175d7b0a..4c62f61157f9166b49d7f186176d854105647f00 100644 (file)
--- a/windows/VC7/mesa/mesa/mesa.vcproj
+++ b/windows/VC7/mesa/mesa/mesa.vcproj
@@ -393,7 +393,10 @@
                                RelativePath="..\..\..\..\src\mesa\swrast\s_texstore.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\swrast\s_texture.c">\r
+                               RelativePath="..\..\..\..\src\mesa\swrast\s_texcombine.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\swrast\s_texfilter.c">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\swrast\s_triangle.c">\r
@@ -907,7 +910,10 @@
                                RelativePath="..\..\..\..\src\mesa\swrast\s_stencil.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\swrast\s_texture.h">\r
+                               RelativePath="..\..\..\..\src\mesa\swrast\s_texcombine.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\swrast\s_texfilter.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\swrast\s_triangle.h">\r