wined3d: Merge pixelshader.c and vertexshader.c.

2b1ee873 · Henri Verbeet · Alexandre Julliard · 57a47b08 · 2b1ee873 · 57a47b08
Commit 2b1ee873 authored Dec 30, 2009 by Henri Verbeet Committed by Alexandre Julliard Dec 31, 2009
Showing with 1 addition and 2 deletions

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

pixelshader.c dlls/wined3d/pixelshader.c +0 -0

shader.c dlls/wined3d/shader.c +0 -0

vertexshader.c dlls/wined3d/vertexshader.c +0 -0

No files found.
--- a/dlls/wined3d/Makefile.in
+++ b/dlls/wined3d/Makefile.in
@@ -22,9 +22,9 @@ C_SRCS = \
 	glsl_shader.c \
 	nvidia_texture_shader.c \
 	palette.c \
-	pixelshader.c \
 	query.c \
 	resource.c \
+	shader.c \
 	shader_sm1.c \
 	shader_sm4.c \
 	state.c \
@@ -38,7 +38,6 @@ C_SRCS = \
 	texture.c \
 	utils.c \
 	vertexdeclaration.c \
-	vertexshader.c \
 	view.c \
 	volume.c \
 	volumetexture.c \

--- a/dlls/wined3d/pixelshader.c
+++ b/dlls/wined3d/pixelshader.c
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
--- a/dlls/wined3d/vertexshader.c
+++ b/dlls/wined3d/vertexshader.c