d3d9: Merge volumetexture.c into texture.c.

5145b131 · Henri Verbeet · Alexandre Julliard · fb5bc724 · 5145b131 · 5145b131
Commit 5145b131 authored Apr 24, 2012 by Henri Verbeet Committed by Alexandre Julliard Apr 25, 2012
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

Makefile.in dlls/d3d9/Makefile.in +1 -2

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

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

No files found.
--- a/dlls/d3d9/Makefile.in
+++ b/dlls/d3d9/Makefile.in
@@ -14,8 +14,7 @@ C_SRCS = \
 	swapchain.c \
 	texture.c \
 	vertexdeclaration.c \
-	volume.c \
-	volumetexture.c
+	volume.c

 RC_SRCS = version.rc


--- a/dlls/d3d9/texture.c
+++ b/dlls/d3d9/texture.c
--- a/dlls/d3d9/volumetexture.c
+++ b/dlls/d3d9/volumetexture.c