Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_transform().
Alexandre Julliard
julliard at winehq.org
Fri May 14 15:47:04 CDT 2021
Module: wine
Branch: master
Commit: 6f9e338599462ff75d0fe296022ec4449d76fddc
URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f9e338599462ff75d0fe296022ec4449d76fddc
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Thu May 13 10:47:48 2021 -0500
wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_transform().
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 e94d1a19dc2..6345aa4f634 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -1832,17 +1832,17 @@ static void wined3d_cs_exec_set_transform(struct wined3d_cs *cs, const void *dat
device_invalidate_state(cs->c.device, STATE_TRANSFORM(op->state));
}
-void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform_state state,
- const struct wined3d_matrix *matrix)
+void wined3d_device_context_emit_set_transform(struct wined3d_device_context *context,
+ enum wined3d_transform_state state, const struct wined3d_matrix *matrix)
{
struct wined3d_cs_set_transform *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_TRANSFORM;
op->state = state;
op->matrix = *matrix;
- 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_clip_plane(struct wined3d_cs *cs, const void *data)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index e62da01171c..e8be09d9e78 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1330,7 +1330,7 @@ static void wined3d_device_set_transform(struct wined3d_device *device,
}
device->cs->c.state->transforms[state] = *matrix;
- wined3d_cs_emit_set_transform(device->cs, state, matrix);
+ wined3d_device_context_emit_set_transform(&device->cs->c, state, matrix);
}
static void wined3d_device_get_transform(const struct wined3d_device *device,
@@ -1832,7 +1832,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3
for (i = 0; i < WINED3D_HIGHEST_TRANSFORM_STATE + 1; ++i)
{
- wined3d_cs_emit_set_transform(device->cs, i, state->transforms + i);
+ wined3d_device_context_emit_set_transform(context, i, state->transforms + i);
}
for (i = 0; i < WINED3D_MAX_CLIP_DISTANCES; ++i)
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index c752be692fc..69021675fe7 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -4757,8 +4757,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_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx,
UINT frequency, UINT flags) DECLSPEC_HIDDEN;
-void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform_state state,
- const struct wined3d_matrix *matrix) DECLSPEC_HIDDEN;
void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN;
void wined3d_cs_init_object(struct wined3d_cs *cs,
void (*callback)(void *object), void *object) DECLSPEC_HIDDEN;
@@ -4828,6 +4826,8 @@ void wined3d_device_context_emit_set_texture(struct wined3d_device_context *cont
struct wined3d_texture *texture) DECLSPEC_HIDDEN;
void wined3d_device_context_emit_set_texture_state(struct wined3d_device_context *context, unsigned int stage,
enum wined3d_texture_stage_state state, unsigned int value) DECLSPEC_HIDDEN;
+void wined3d_device_context_emit_set_transform(struct wined3d_device_context *context,
+ enum wined3d_transform_state state, const struct wined3d_matrix *matrix) 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;
More information about the wine-cvs
mailing list