d3d8: Merge volumetexture.c into texture.c.

715fd2ae · Henri Verbeet · Alexandre Julliard · 620b5e0b · 715fd2ae · 715fd2ae
Commit 715fd2ae authored Apr 18, 2012 by Henri Verbeet Committed by Alexandre Julliard Apr 19, 2012
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

Makefile.in dlls/d3d8/Makefile.in +1 -3

texture.c dlls/d3d8/texture.c +0 -0

volumetexture.c dlls/d3d8/volumetexture.c +0 -0

No files found.
--- a/dlls/d3d8/Makefile.in
+++ b/dlls/d3d8/Makefile.in
@@ -12,9 +12,7 @@ C_SRCS = \
 	swapchain.c \
 	texture.c \
 	vertexdeclaration.c \
-	volume.c \
-	volumetexture.c
-
+	volume.c
 RC_SRCS = version.rc

 @MAKE_DLL_RULES@
--- a/dlls/d3d8/texture.c
+++ b/dlls/d3d8/texture.c
--- a/dlls/d3d8/volumetexture.c
+++ b/dlls/d3d8/volumetexture.c