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@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2016-05-25 10:51:18 +02:00 committed by Alexandre Julliard
parent 73d0328be7
commit 3ab205ef94
1 changed files with 15 additions and 0 deletions

View File

@ -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)