From b557f5ba3ad84e1c0f673160f7a7fb2dbf27add5 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Fri, 4 Jan 2013 12:03:00 +0100 Subject: [PATCH] wined3d: Don't touch state->user_stream in wined3d_device_process_vertices(). device_stream_info_from_declaration() no longer cares about state->user_stream. --- dlls/wined3d/device.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 88524724a5c..57eb0d21a80 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3575,7 +3575,6 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, struct wined3d_state *state = &device->stateBlock->state; struct wined3d_stream_info stream_info; const struct wined3d_gl_info *gl_info; - BOOL streamWasUP = state->user_stream; struct wined3d_context *context; struct wined3d_shader *vs; unsigned int i; @@ -3593,14 +3592,9 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, context = context_acquire(device, NULL); gl_info = context->gl_info; - /* ProcessVertices reads from vertex buffers, which have to be assigned. - * DrawPrimitive and DrawPrimitiveUP control the streamIsUP flag, thus - * restore it afterwards. */ vs = state->vertex_shader; state->vertex_shader = NULL; - state->user_stream = FALSE; device_stream_info_from_declaration(device, &stream_info); - state->user_stream = streamWasUP; state->vertex_shader = vs; /* We can't convert FROM a VBO, and vertex buffers used to source into