Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/wined3d/cs.c | 6 +++--- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index fd8ebbbd40f..7ec3c428fc4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2039,16 +2039,16 @@ static void wined3d_cs_exec_set_light_enable(struct wined3d_cs *cs, const void * } }
-void wined3d_cs_emit_set_light_enable(struct wined3d_cs *cs, unsigned int idx, BOOL enable) +void wined3d_device_context_emit_set_light_enable(struct wined3d_device_context *context, unsigned int idx, BOOL enable) { struct wined3d_cs_set_light_enable *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_ENABLE; op->idx = idx; op->enable = enable;
- 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_feature_level(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 751df25f559..905357571bf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1469,7 +1469,7 @@ static void wined3d_device_set_light_enable(struct wined3d_device *device, UINT }
wined3d_light_state_enable_light(light_state, &device->adapter->d3d_info, light_info, enable); - wined3d_cs_emit_set_light_enable(device->cs, light_idx, enable); + wined3d_device_context_emit_set_light_enable(&device->cs->c, light_idx, enable); }
static HRESULT wined3d_device_set_clip_plane(struct wined3d_device *device, @@ -1850,7 +1850,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 LIST_FOR_EACH_ENTRY(light, &state->light_state.light_map[i], struct wined3d_light_info, entry) { wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); - wined3d_cs_emit_set_light_enable(device->cs, light->OriginalIndex, light->glIndex != -1); + wined3d_device_context_emit_set_light_enable(context, light->OriginalIndex, light->glIndex != -1); } }
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a338c39ef3c..8e419ed9c0f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4749,7 +4749,6 @@ 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_light_enable(struct wined3d_cs *cs, unsigned int idx, BOOL enable) 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, @@ -4800,6 +4799,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_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, const struct wined3d_material *material) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_predication(struct wined3d_device_context *context,