Henri Verbeet : wined3d: Use the command stream state in wined3d_cs_exec_draw().
Module: wine Branch: master Commit: a7560cf695acaf378b8ca37989220fce6ddd3a44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7560cf695acaf378b8ca37989... Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 28 06:11:58 2017 +0100 wined3d: Use the command stream state in wined3d_cs_exec_draw(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c686181..1769dc1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -581,7 +581,7 @@ void wined3d_cs_emit_dispatch(struct wined3d_cs *cs, static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) { - struct wined3d_state *state = &cs->device->state; + struct wined3d_state *state = &cs->state; const struct wined3d_cs_draw *op = data; unsigned int i; @@ -592,11 +592,11 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) device_invalidate_state(cs->device, STATE_BASEVERTEXINDEX); } - if (cs->state.gl_primitive_type != op->primitive_type) + if (state->gl_primitive_type != op->primitive_type) { - if (cs->state.gl_primitive_type == GL_POINTS || op->primitive_type == GL_POINTS) + if (state->gl_primitive_type == GL_POINTS || op->primitive_type == GL_POINTS) device_invalidate_state(cs->device, STATE_POINT_ENABLE); - cs->state.gl_primitive_type = op->primitive_type; + state->gl_primitive_type = op->primitive_type; } draw_primitive(cs->device, state, op->base_vertex_idx, op->start_idx,
participants (1)
-
Alexandre Julliard