Stefan Dösinger : wined3d: Avoid storing a material pointer in struct wined3d_cs_set_material.
Module: wine Branch: master Commit: cecc496ecf4f0c3cafe889c3a0e80e487d113314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cecc496ecf4f0c3cafe889c3a0... Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 17 16:30:07 2016 +0100 wined3d: Avoid storing a material pointer in struct wined3d_cs_set_material. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 21310e4..965bcff 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -242,7 +242,7 @@ struct wined3d_cs_set_clip_plane struct wined3d_cs_set_material { enum wined3d_cs_op opcode; - const struct wined3d_material *material; + struct wined3d_material material; }; struct wined3d_cs_reset_state @@ -979,7 +979,7 @@ static void wined3d_cs_exec_set_material(struct wined3d_cs *cs, const void *data { const struct wined3d_cs_set_material *op = data; - cs->state.material = *op->material; + cs->state.material = op->material; device_invalidate_state(cs->device, STATE_MATERIAL); } @@ -989,7 +989,7 @@ void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_ma op = cs->ops->require_space(cs, sizeof(*op)); op->opcode = WINED3D_CS_OP_SET_MATERIAL; - op->material = material; + op->material = *material; cs->ops->submit(cs); }
participants (1)
-
Alexandre Julliard