diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index f7b682b627e..f32699c40cd 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1304,19 +1304,19 @@ static void wined3d_cs_exec_set_stream_source(struct wined3d_cs *cs, const void device_invalidate_state(cs->c.device, STATE_STREAMSRC); } -void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, - struct wined3d_buffer *buffer, UINT offset, UINT stride) +void wined3d_device_context_emit_set_stream_source(struct wined3d_device_context *context, unsigned int stream_idx, + struct wined3d_buffer *buffer, unsigned int offset, unsigned int stride) { struct wined3d_cs_set_stream_source *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_STREAM_SOURCE; op->stream_idx = stream_idx; op->buffer = buffer; op->offset = offset; op->stride = stride; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_stream_source_freq(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9d70eb62eaa..d02845737dc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1299,7 +1299,7 @@ HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UI stream->offset = offset; if (buffer) wined3d_buffer_incref(buffer); - wined3d_cs_emit_set_stream_source(device->cs, stream_idx, buffer, offset, stride); + wined3d_device_context_emit_set_stream_source(&device->cs->c, stream_idx, buffer, offset, stride); if (prev_buffer) wined3d_buffer_decref(prev_buffer); @@ -1825,7 +1825,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 for (i = 0; i < WINED3D_MAX_STREAMS; ++i) { - wined3d_cs_emit_set_stream_source(device->cs, i, state->streams[i].buffer, + wined3d_device_context_emit_set_stream_source(context, i, state->streams[i].buffer, state->streams[i].offset, state->streams[i].stride); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ac1e7a3e4ab..e3c165716e1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4765,8 +4765,6 @@ void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_output(struct wined3d_cs *cs, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, - struct wined3d_buffer *buffer, UINT offset, UINT stride) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx, UINT frequency, UINT flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined3d_texture *texture) DECLSPEC_HIDDEN; @@ -4822,6 +4820,8 @@ void wined3d_device_context_emit_set_shader(struct wined3d_device_context *conte void wined3d_device_context_emit_set_shader_resource_view(struct wined3d_device_context *context, enum wined3d_shader_type type, unsigned int view_idx, struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_stream_source(struct wined3d_device_context *context, unsigned int stream_idx, + struct wined3d_buffer *buffer, unsigned int offset, unsigned int stride) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_unordered_access_view(struct wined3d_device_context *context, enum wined3d_pipeline pipeline, unsigned int view_idx, struct wined3d_unordered_access_view *view, unsigned int initial_count) DECLSPEC_HIDDEN;