Henri Verbeet : wined3d: Make the "icb" field in struct wined3d_shader_instruction const.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Feb 5 08:24:18 CST 2016
Module: wine
Branch: master
Commit: 48d755f61d4ee5982b729fa0522a5fd3af391888
URL: http://source.winehq.org/git/wine.git/?a=commit;h=48d755f61d4ee5982b729fa0522a5fd3af391888
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Feb 4 21:56:36 2016 +0100
wined3d: Make the "icb" field in struct wined3d_shader_instruction const.
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/shader_sm4.c | 4 ++--
dlls/wined3d/wined3d_private.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index 2de7fc4..45bd9f0 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -917,9 +917,9 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi
return;
}
+ priv->icb.element_count = len;
+ memcpy(priv->icb.data, p, sizeof(*p) * icb_size);
ins->declaration.icb = &priv->icb;
- ins->declaration.icb->element_count = len;
- memcpy(ins->declaration.icb->data, p, sizeof(*p) * icb_size);
}
else if (opcode == WINED3D_SM4_OP_DCL_RESOURCE)
{
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 8c939f8..ccd0c60 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -819,7 +819,7 @@ struct wined3d_shader_instruction
struct wined3d_shader_dst_param dst;
struct wined3d_shader_src_param src;
UINT count;
- struct wined3d_shader_immediate_constant_buffer *icb;
+ const struct wined3d_shader_immediate_constant_buffer *icb;
} declaration;
};
More information about the wine-cvs
mailing list