=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Ignore flags for conditional SM 1-3 instructions explicitly.
Alexandre Julliard
julliard at winehq.org
Wed May 25 10:41:09 CDT 2016
Module: wine
Branch: master
Commit: 3ab205ef949a99a275e37b1c5b47d181c8040fb0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ab205ef949a99a275e37b1c5b47d181c8040fb0
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Wed May 25 10:51:18 2016 +0200
wined3d: Ignore flags for conditional SM 1-3 instructions explicitly.
This is to make sure that a regression is not introduced when the SM4+
_nz/_z modifiers are implemented for these instructions.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/shader_sm1.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c
index 54312d4..2a1f4a4 100644
--- a/dlls/wined3d/shader_sm1.c
+++ b/dlls/wined3d/shader_sm1.c
@@ -708,6 +708,19 @@ static void shader_sm1_read_comment(const DWORD **ptr)
}
}
+static void shader_sm1_validate_instruction(struct wined3d_shader_instruction *ins)
+{
+ if (ins->handler_idx == WINED3DSIH_BREAKP || ins->handler_idx == WINED3DSIH_IF)
+ {
+ if (ins->flags)
+ {
+ FIXME("Ignoring unexpected instruction flags %#x for %s.\n",
+ ins->flags, debug_d3dshaderinstructionhandler(ins->handler_idx));
+ ins->flags = 0;
+ }
+ }
+}
+
static void shader_sm1_read_instruction(void *data, const DWORD **ptr, struct wined3d_shader_instruction *ins)
{
const struct wined3d_sm1_opcode_info *opcode_info;
@@ -775,6 +788,8 @@ static void shader_sm1_read_instruction(void *data, const DWORD **ptr, struct wi
shader_sm1_read_src_param(priv, &p, &priv->src_param[i], &priv->src_rel_addr[i]);
}
}
+
+ shader_sm1_validate_instruction(ins);
}
static BOOL shader_sm1_is_end(void *data, const DWORD **ptr)
More information about the wine-cvs
mailing list