=?UTF-8?Q?Stefan=20D=C3=B6singer=20?=: wined3d: Avoid storing a transformation matrix pointer in struct wined3d_cs_set_transform.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Mar 22 10:55:10 CDT 2016
Module: wine
Branch: master
Commit: 1422add1dfca731d7558fa6f9c1a5205952ab07f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1422add1dfca731d7558fa6f9c1a5205952ab07f
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Mon Mar 21 17:40:15 2016 +0100
wined3d: Avoid storing a transformation matrix pointer in struct wined3d_cs_set_transform.
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at 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 6809aa2..e36429d 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -229,7 +229,7 @@ struct wined3d_cs_set_transform
{
enum wined3d_cs_op opcode;
enum wined3d_transform_state state;
- const struct wined3d_matrix *matrix;
+ struct wined3d_matrix matrix;
};
struct wined3d_cs_set_clip_plane
@@ -854,7 +854,7 @@ static void wined3d_cs_exec_set_transform(struct wined3d_cs *cs, const void *dat
{
const struct wined3d_cs_set_transform *op = data;
- cs->state.transforms[op->state] = *op->matrix;
+ cs->state.transforms[op->state] = op->matrix;
if (op->state < WINED3D_TS_WORLD_MATRIX(cs->device->adapter->d3d_info.limits.ffp_vertex_blend_matrices))
device_invalidate_state(cs->device, STATE_TRANSFORM(op->state));
}
@@ -867,7 +867,7 @@ void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform
op = cs->ops->require_space(cs, sizeof(*op));
op->opcode = WINED3D_CS_OP_SET_TRANSFORM;
op->state = state;
- op->matrix = matrix;
+ op->matrix = *matrix;
cs->ops->submit(cs);
}
More information about the wine-cvs
mailing list