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

windows/VC6/mesa/mesa/mesa.dsp

@@ -450,7 +450,11 @@ SOURCE=..\..\..\..\src\mesa\swrast\s_texstore.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\src\mesa\swrast\s_texture.c
+SOURCE=..\..\..\..\src\mesa\swrast\s_texcombine.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\mesa\swrast\s_texfiltere.c
 # End Source File
 # Begin Source File
 
@@ -1119,7 +1123,11 @@ SOURCE=..\..\..\..\src\mesa\swrast\s_stencil.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\src\mesa\swrast\s_texture.h
+SOURCE=..\..\..\..\src\mesa\swrast\s_texcombine.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\mesa\swrast\s_texfilter.h
 # End Source File
 # Begin Source File
 

windows/VC7/mesa/mesa/mesa.vcproj

@@ -393,7 +393,10 @@
 				RelativePath="..\..\..\..\src\mesa\swrast\s_texstore.c">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_texture.c">
+				RelativePath="..\..\..\..\src\mesa\swrast\s_texcombine.c">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\swrast\s_texfilter.c">
 			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\swrast\s_triangle.c">
@@ -907,7 +910,10 @@
 				RelativePath="..\..\..\..\src\mesa\swrast\s_stencil.h">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\mesa\swrast\s_texture.h">
+				RelativePath="..\..\..\..\src\mesa\swrast\s_texcombine.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\swrast\s_texfilter.h">
 			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\swrast\s_triangle.h">