=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Recognize SM5 ld_structured opcode.

Alexandre Julliard julliard at wine.codeweavers.com
Thu Mar 17 10:02:14 CDT 2016


Module: wine
Branch: master
Commit: f0de33ba1450a3cd8e4f10da79793fc107816843
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f0de33ba1450a3cd8e4f10da79793fc107816843

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Thu Mar 17 11:47:10 2016 +0100

wined3d: Recognize SM5 ld_structured 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             | 1 +
 dlls/wined3d/shader_sm4.c         | 2 ++
 dlls/wined3d/wined3d_private.h    | 1 +
 5 files changed, 6 insertions(+)

diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 7c4c1db..00d876e 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5281,6 +5281,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
     /* WINED3DSIH_ITOF                          */ NULL,
     /* WINED3DSIH_LABEL                         */ shader_hw_label,
     /* WINED3DSIH_LD                            */ NULL,
+    /* WINED3DSIH_LD_STRUCTURED                 */ NULL,
     /* WINED3DSIH_LIT                           */ shader_hw_map2gl,
     /* WINED3DSIH_LOG                           */ shader_hw_scalar_op,
     /* WINED3DSIH_LOGP                          */ shader_hw_scalar_op,
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index d9311b9..0ef15ae 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -8123,6 +8123,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
     /* WINED3DSIH_ITOF                          */ shader_glsl_to_float,
     /* WINED3DSIH_LABEL                         */ shader_glsl_label,
     /* WINED3DSIH_LD                            */ shader_glsl_ld,
+    /* WINED3DSIH_LD_STRUCTURED                 */ NULL,
     /* WINED3DSIH_LIT                           */ shader_glsl_lit,
     /* WINED3DSIH_LOG                           */ shader_glsl_scalar_op,
     /* WINED3DSIH_LOGP                          */ shader_glsl_scalar_op,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 17611dd..5e8df04 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -109,6 +109,7 @@ static const char * const shader_opcode_names[] =
     /* WINED3DSIH_ITOF                          */ "itof",
     /* WINED3DSIH_LABEL                         */ "label",
     /* WINED3DSIH_LD                            */ "ld",
+    /* WINED3DSIH_LD_STRUCTURED                 */ "ld_structured",
     /* WINED3DSIH_LIT                           */ "lit",
     /* WINED3DSIH_LOG                           */ "log",
     /* WINED3DSIH_LOGP                          */ "logp",
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index 9cf74a5..5757aca 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -183,6 +183,7 @@ enum wined3d_sm4_opcode
     WINED3D_SM4_OP_DCL_OUTPUT_SIV       = 0x67,
     WINED3D_SM4_OP_DCL_TEMPS            = 0x68,
     WINED3D_SM4_OP_DCL_GLOBAL_FLAGS     = 0x6a,
+    WINED3D_SM5_OP_LD_STRUCTURED        = 0xa7,
 };
 
 enum wined3d_sm4_register_type
@@ -384,6 +385,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
     {WINED3D_SM4_OP_DCL_OUTPUT_SIV,         WINED3DSIH_DCL_OUTPUT_SIV,                "",     ""},
     {WINED3D_SM4_OP_DCL_TEMPS,              WINED3DSIH_DCL_TEMPS,                     "",     ""},
     {WINED3D_SM4_OP_DCL_GLOBAL_FLAGS,       WINED3DSIH_DCL_GLOBAL_FLAGS,              "",     ""},
+    {WINED3D_SM5_OP_LD_STRUCTURED,          WINED3DSIH_LD_STRUCTURED,                 "U",    "UUR"},
 };
 
 static const enum wined3d_shader_register_type register_type_table[] =
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 09fbb76..d474bee 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -561,6 +561,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
     WINED3DSIH_ITOF,
     WINED3DSIH_LABEL,
     WINED3DSIH_LD,
+    WINED3DSIH_LD_STRUCTURED,
     WINED3DSIH_LIT,
     WINED3DSIH_LOG,
     WINED3DSIH_LOGP,




More information about the wine-cvs mailing list