=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Recognize SM4 dcl_input_siv opcode.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Feb 2 09:59:29 CST 2016
Module: wine
Branch: master
Commit: 3e64e1a564cb97858992e63881756b6154c0cd33
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e64e1a564cb97858992e63881756b6154c0cd33
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Tue Feb 2 11:32:33 2016 +0100
wined3d: Recognize SM4 dcl_input_siv opcode.
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/arb_program_shader.c | 1 +
dlls/wined3d/glsl_shader.c | 1 +
dlls/wined3d/shader.c | 2 ++
dlls/wined3d/shader_sm4.c | 3 +++
dlls/wined3d/wined3d_private.h | 1 +
5 files changed, 8 insertions(+)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 6b35042..ffaff80 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5234,6 +5234,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_DCL_INPUT_PS_SGV */ NULL,
/* WINED3DSIH_DCL_INPUT_PS_SIV */ NULL,
/* WINED3DSIH_DCL_INPUT_SGV */ NULL,
+ /* WINED3DSIH_DCL_INPUT_SIV */ NULL,
/* WINED3DSIH_DCL_OUTPUT */ NULL,
/* WINED3DSIH_DCL_OUTPUT_SIV */ NULL,
/* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ shader_hw_nop,
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 926c1e3..7e78e64 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -8022,6 +8022,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_DCL_INPUT_PS_SGV */ NULL,
/* WINED3DSIH_DCL_INPUT_PS_SIV */ NULL,
/* WINED3DSIH_DCL_INPUT_SGV */ shader_glsl_nop,
+ /* WINED3DSIH_DCL_INPUT_SIV */ shader_glsl_nop,
/* WINED3DSIH_DCL_OUTPUT */ shader_glsl_nop,
/* WINED3DSIH_DCL_OUTPUT_SIV */ shader_glsl_nop,
/* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ shader_glsl_nop,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 6315bf5..4829ad2 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -62,6 +62,7 @@ static const char * const shader_opcode_names[] =
/* WINED3DSIH_DCL_INPUT_PS_SGV */ "dcl_input_ps_sgv",
/* WINED3DSIH_DCL_INPUT_PS_SIV */ "dcl_input_ps_siv",
/* WINED3DSIH_DCL_INPUT_SGV */ "dcl_input_sgv",
+ /* WINED3DSIH_DCL_INPUT_SIV */ "dcl_input_siv",
/* WINED3DSIH_DCL_OUTPUT */ "dcl_output",
/* WINED3DSIH_DCL_OUTPUT_SIV */ "dcl_output_siv",
/* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ "dcl_outputTopology",
@@ -1920,6 +1921,7 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe
}
else if (ins.handler_idx == WINED3DSIH_DCL_INPUT_PS_SGV
|| ins.handler_idx == WINED3DSIH_DCL_INPUT_SGV
+ || ins.handler_idx == WINED3DSIH_DCL_INPUT_SIV
|| ins.handler_idx == WINED3DSIH_DCL_OUTPUT_SIV)
{
TRACE("%s ", shader_opcode_names[ins.handler_idx]);
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index 11c0494..4a9aa6b 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -163,6 +163,7 @@ enum wined3d_sm4_opcode
WINED3D_SM4_OP_DCL_VERTICES_OUT = 0x5e,
WINED3D_SM4_OP_DCL_INPUT = 0x5f,
WINED3D_SM4_OP_DCL_INPUT_SGV = 0x60,
+ WINED3D_SM4_OP_DCL_INPUT_SIV = 0x61,
WINED3D_SM4_OP_DCL_INPUT_PS = 0x62,
WINED3D_SM4_OP_DCL_INPUT_PS_SGV = 0x63,
WINED3D_SM4_OP_DCL_INPUT_PS_SIV = 0x64,
@@ -372,6 +373,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
{WINED3D_SM4_OP_DCL_VERTICES_OUT, WINED3DSIH_DCL_VERTICES_OUT, "", ""},
{WINED3D_SM4_OP_DCL_INPUT, WINED3DSIH_DCL_INPUT, "", ""},
{WINED3D_SM4_OP_DCL_INPUT_SGV, WINED3DSIH_DCL_INPUT_SGV, "", ""},
+ {WINED3D_SM4_OP_DCL_INPUT_SIV, WINED3DSIH_DCL_INPUT_SIV, "", ""},
{WINED3D_SM4_OP_DCL_INPUT_PS, WINED3DSIH_DCL_INPUT_PS, "", ""},
{WINED3D_SM4_OP_DCL_INPUT_PS_SGV, WINED3DSIH_DCL_INPUT_PS_SGV, "", ""},
{WINED3D_SM4_OP_DCL_INPUT_PS_SIV, WINED3DSIH_DCL_INPUT_PS_SIV, "", ""},
@@ -995,6 +997,7 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi
}
else if (opcode == WINED3D_SM4_OP_DCL_INPUT_PS_SGV
|| opcode == WINED3D_SM4_OP_DCL_INPUT_SGV
+ || opcode == WINED3D_SM4_OP_DCL_INPUT_SIV
|| opcode == WINED3D_SM4_OP_DCL_OUTPUT_SIV)
{
shader_sm4_read_dst_param(priv, &p, WINED3D_DATA_FLOAT, &ins->declaration.register_semantic.reg);
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 624a0e9..9e4d1c3 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -506,6 +506,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_DCL_INPUT_PS_SGV,
WINED3DSIH_DCL_INPUT_PS_SIV,
WINED3DSIH_DCL_INPUT_SGV,
+ WINED3DSIH_DCL_INPUT_SIV,
WINED3DSIH_DCL_OUTPUT,
WINED3DSIH_DCL_OUTPUT_SIV,
WINED3DSIH_DCL_OUTPUT_TOPOLOGY,
More information about the wine-cvs
mailing list