Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_stream_output().
Alexandre Julliard
julliard at winehq.org
Thu Mar 25 16:49:22 CDT 2021
Module: wine
Branch: master
Commit: 212ccdaccf068e312cd0438da0e5ee28352b8960
URL: https://source.winehq.org/git/wine.git/?a=commit;h=212ccdaccf068e312cd0438da0e5ee28352b8960
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Wed Mar 24 18:19:28 2021 -0500
wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_stream_output().
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/cs.c | 8 ++++----
dlls/wined3d/device.c | 4 ++--
dlls/wined3d/wined3d_private.h | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
index 4a61cdae904..c9bc9443e5d 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -1364,18 +1364,18 @@ static void wined3d_cs_exec_set_stream_output(struct wined3d_cs *cs, const void
device_invalidate_state(cs->c.device, STATE_STREAM_OUTPUT);
}
-void wined3d_cs_emit_set_stream_output(struct wined3d_cs *cs, UINT stream_idx,
- struct wined3d_buffer *buffer, UINT offset)
+void wined3d_device_context_emit_set_stream_output(struct wined3d_device_context *context, unsigned int stream_idx,
+ struct wined3d_buffer *buffer, unsigned int offset)
{
struct wined3d_cs_set_stream_output *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_OUTPUT;
op->stream_idx = stream_idx;
op->buffer = buffer;
op->offset = offset;
- 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_index_buffer(struct wined3d_cs *cs, const void *data)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 067fdecf3cf..9766dfada2d 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1242,7 +1242,7 @@ void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT
wined3d_buffer_incref(buffer);
stream->buffer = buffer;
stream->offset = offset;
- wined3d_cs_emit_set_stream_output(device->cs, idx, buffer, offset);
+ wined3d_device_context_emit_set_stream_output(&device->cs->c, idx, buffer, offset);
if (prev_buffer)
wined3d_buffer_decref(prev_buffer);
}
@@ -1766,7 +1766,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3
for (i = 0; i < WINED3D_MAX_STREAM_OUTPUT_BUFFERS; ++i)
{
- wined3d_cs_emit_set_stream_output(device->cs, i,
+ wined3d_device_context_emit_set_stream_output(context, i,
state->stream_output[i].buffer, state->stream_output[i].offset);
}
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 24237d0bdd7..ba86cb7ebdb 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -4761,8 +4761,6 @@ void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs,
enum wined3d_render_state state, DWORD value) DECLSPEC_HIDDEN;
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_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;
@@ -4818,6 +4816,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_output(struct wined3d_device_context *context, unsigned int stream_idx,
+ struct wined3d_buffer *buffer, unsigned int offset) 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,
More information about the wine-cvs
mailing list