Skip to content

W
wine-winehq
Commit b557f5ba authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

wined3d: Don't touch state->user_stream in wined3d_device_process_vertices().

device_stream_info_from_declaration() no longer cares about state->user_stream.
parent 76a2864a
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
dlls/wined3d/device.c
View file @ b557f5ba
...@@ -3575,7 +3575,6 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, ...@@ -3575,7 +3575,6 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device,
struct wined3d_state *state = &device->stateBlock->state; struct wined3d_state *state = &device->stateBlock->state;
struct wined3d_stream_info stream_info; struct wined3d_stream_info stream_info;
const struct wined3d_gl_info *gl_info; const struct wined3d_gl_info *gl_info;
BOOL streamWasUP = state->user_stream;
struct wined3d_context *context; struct wined3d_context *context;
struct wined3d_shader *vs; struct wined3d_shader *vs;
unsigned int i; unsigned int i;
...@@ -3593,14 +3592,9 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, ...@@ -3593,14 +3592,9 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device,
context = context_acquire(device, NULL); context = context_acquire(device, NULL);
gl_info = context->gl_info; 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; vs = state->vertex_shader;
state->vertex_shader = NULL; state->vertex_shader = NULL;
state->user_stream = FALSE;
device_stream_info_from_declaration(device, &stream_info); device_stream_info_from_declaration(device, &stream_info);
state->user_stream = streamWasUP;
state->vertex_shader = vs; state->vertex_shader = vs;
/* We can't convert FROM a VBO, and vertex buffers used to source into /* We can't convert FROM a VBO, and vertex buffers used to source into
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment