diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 4efbe61b3fb..2aaeeab95a6 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1700,16 +1700,16 @@ static void wined3d_cs_exec_set_rasterizer_state(struct wined3d_cs *cs, const vo device_invalidate_state(cs->c.device, STATE_RASTERIZER); } -void wined3d_cs_emit_set_rasterizer_state(struct wined3d_cs *cs, +void wined3d_device_context_emit_set_rasterizer_state(struct wined3d_device_context *context, struct wined3d_rasterizer_state *rasterizer_state) { struct wined3d_cs_set_rasterizer_state *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_RASTERIZER_STATE; op->state = rasterizer_state; - 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_render_state(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3864bcfbb81..e0b26270ada 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1792,7 +1792,7 @@ void CDECL wined3d_device_set_rasterizer_state(struct wined3d_device *device, if (rasterizer_state) wined3d_rasterizer_state_incref(rasterizer_state); state->rasterizer_state = rasterizer_state; - wined3d_cs_emit_set_rasterizer_state(device->cs, rasterizer_state); + wined3d_device_context_emit_set_rasterizer_state(&device->cs->c, rasterizer_state); if (prev) wined3d_rasterizer_state_decref(prev); } @@ -2015,7 +2015,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 wined3d_device_context_emit_set_blend_state(context, state->blend_state, &state->blend_factor, state->sample_mask); wined3d_device_context_emit_set_depth_stencil_state(context, state->depth_stencil_state, state->stencil_ref); - wined3d_cs_emit_set_rasterizer_state(device->cs, state->rasterizer_state); + wined3d_device_context_emit_set_rasterizer_state(context, state->rasterizer_state); } struct wined3d_state * CDECL wined3d_device_get_state(struct wined3d_device *device) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fa8a425334f..63d4b9feb00 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4754,8 +4754,6 @@ void wined3d_cs_emit_set_light_enable(struct wined3d_cs *cs, unsigned int idx, B void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_material *material) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_predication(struct wined3d_cs *cs, struct wined3d_query *predicate, BOOL value) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_rasterizer_state(struct wined3d_cs *cs, - struct wined3d_rasterizer_state *rasterizer_state) 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_rendertarget_view(struct wined3d_cs *cs, unsigned int view_idx, @@ -4813,6 +4811,8 @@ void wined3d_device_context_emit_set_constant_buffer(struct wined3d_device_conte enum wined3d_shader_type type, UINT cb_idx, struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_depth_stencil_state(struct wined3d_device_context *context, struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_rasterizer_state(struct wined3d_device_context *context, + struct wined3d_rasterizer_state *rasterizer_state) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_shader(struct wined3d_device_context *context, enum wined3d_shader_type type, struct wined3d_shader *shader) DECLSPEC_HIDDEN;