commit cecc496ecf4f0c3cafe889c3a0e80e487d113314
author Stefan Dösinger <stefan@codeweavers.com> Thu Mar 17 16:30:07 2016 +0100
committer Alexandre Julliard <julliard@winehq.org> Fri Mar 18 12:21:01 2016 +0900
tree e96b274c68978ea3ec51d8f40cdb7e21e21f76da
parent 687642fafaaa7220e847d33398945d5c77a2bb15

wined3d: Avoid storing a material pointer in struct wined3d_cs_set_material.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dlls/wined3d/cs.c

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_material
 {
     enum wined3d_cs_op opcode;
-    const struct wined3d_material *material;
+    struct wined3d_material material;
 };
 
 struct wined3d_cs_reset_state
@@ -979,7 +979,7 @@
 {
     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 @@
 
     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);
 }