Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_light().
Alexandre Julliard
julliard at winehq.org
Fri May 14 15:47:04 CDT 2021
Module: wine
Branch: master
Commit: adb45b0ad80db90fcd5ce1bd31cb642f347f12e7
URL: https://source.winehq.org/git/wine.git/?a=commit;h=adb45b0ad80db90fcd5ce1bd31cb642f347f12e7
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Thu May 13 10:47:52 2021 -0500
wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_light().
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 | 7 ++++---
dlls/wined3d/device.c | 2 +-
dlls/wined3d/wined3d_private.h | 3 ++-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
index 7ec3c428fc4..21aaa2e54b6 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -2006,15 +2006,16 @@ static void wined3d_cs_exec_set_light(struct wined3d_cs *cs, const void *data)
light_info->cutoff = op->light.cutoff;
}
-void wined3d_cs_emit_set_light(struct wined3d_cs *cs, const struct wined3d_light_info *light)
+void wined3d_device_context_emit_set_light(struct wined3d_device_context *context,
+ const struct wined3d_light_info *light)
{
struct wined3d_cs_set_light *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_LIGHT;
op->light = *light;
- 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_light_enable(struct wined3d_cs *cs, const void *data)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 905357571bf..484130b3103 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1445,7 +1445,7 @@ static void wined3d_device_set_light(struct wined3d_device *device,
FIXME("Unrecognized light type %#x.\n", light->type);
}
- wined3d_cs_emit_set_light(device->cs, object);
+ wined3d_device_context_emit_set_light(&device->cs->c, object);
}
static void wined3d_device_set_light_enable(struct wined3d_device *device, UINT light_idx, BOOL enable)
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 8e419ed9c0f..1be36467c53 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -4748,7 +4748,6 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw
void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) DECLSPEC_HIDDEN;
void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture *texture,
WORD flags, const struct wined3d_color_key *color_key) DECLSPEC_HIDDEN;
-void wined3d_cs_emit_set_light(struct wined3d_cs *cs, const struct wined3d_light_info *light) DECLSPEC_HIDDEN;
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,
@@ -4799,6 +4798,8 @@ void wined3d_device_context_emit_set_feature_level(struct wined3d_device_context
enum wined3d_feature_level level) DECLSPEC_HIDDEN;
void wined3d_device_context_emit_set_index_buffer(struct wined3d_device_context *context, struct wined3d_buffer *buffer,
enum wined3d_format_id format_id, unsigned int offset) DECLSPEC_HIDDEN;
+void wined3d_device_context_emit_set_light(struct wined3d_device_context *context,
+ const struct wined3d_light_info *light) DECLSPEC_HIDDEN;
void wined3d_device_context_emit_set_light_enable(struct wined3d_device_context *context, unsigned int idx,
BOOL enable) DECLSPEC_HIDDEN;
void wined3d_device_context_emit_set_material(struct wined3d_device_context *context,
More information about the wine-cvs
mailing list