wined3d: Merge drawprim.c into context.c.

Signed-off-by: Józef Kucia <jkucia@codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Merge drawprim.c into context.c.
6eb56221 · Józef Kucia · Alexandre Julliard · 66cd8710 · 6eb56221 · 6eb56221
Commit 6eb56221 authored Feb 25, 2018 by Józef Kucia Committed by Alexandre Julliard Feb 26, 2018
Showing with 0 additions and 3 deletions

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

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

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

wined3d_private.h dlls/wined3d/wined3d_private.h +0 -2

No files found.
--- a/dlls/wined3d/Makefile.in
+++ b/dlls/wined3d/Makefile.in
@@ -10,7 +10,6 @@ C_SRCS = \
 	cs.c \
 	device.c \
 	directx.c \
-	drawprim.c \
 	gl_compat.c \
 	glsl_shader.c \
 	nvidia_texture_shader.c \

--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
--- a/dlls/wined3d/drawprim.c
+++ b/dlls/wined3d/drawprim.c
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2135,8 +2135,6 @@ void context_alloc_occlusion_query(struct wined3d_context *context,
 void context_apply_blit_state(struct wined3d_context *context, const struct wined3d_device *device) DECLSPEC_HIDDEN;
 BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_state *state,
        UINT rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN;
-BOOL context_apply_draw_state(struct wined3d_context *context,
-        const struct wined3d_device *device, const struct wined3d_state *state) DECLSPEC_HIDDEN;
 void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target,
        struct wined3d_surface *render_target, struct wined3d_surface *depth_stencil, DWORD location) DECLSPEC_HIDDEN;
 void context_active_texture(struct wined3d_context *context, const struct wined3d_gl_info *gl_info,