[PATCH 6/8] wined3d: Recognize SM5 hs_fork_phase opcode.

Józef Kucia jkucia at codeweavers.com
Tue Mar 29 05:14:56 CDT 2016


Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
 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 3de93da..2c745d7 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5274,6 +5274,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
     /* WINED3DSIH_FTOU                          */ NULL,
     /* WINED3DSIH_GE                            */ NULL,
     /* WINED3DSIH_HS_DECLS                      */ NULL,
+    /* WINED3DSIH_HS_FORK_PHASE                 */ NULL,
     /* WINED3DSIH_IADD                          */ NULL,
     /* WINED3DSIH_IEQ                           */ NULL,
     /* WINED3DSIH_IF                            */ NULL /* Hardcoded into the shader */,
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 174b30f..0f27cbd 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -8168,6 +8168,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
     /* WINED3DSIH_FTOU                          */ shader_glsl_to_uint,
     /* WINED3DSIH_GE                            */ shader_glsl_relop,
     /* WINED3DSIH_HS_DECLS                      */ shader_glsl_nop,
+    /* WINED3DSIH_HS_FORK_PHASE                 */ NULL,
     /* WINED3DSIH_IADD                          */ shader_glsl_binop,
     /* WINED3DSIH_IEQ                           */ shader_glsl_relop,
     /* WINED3DSIH_IF                            */ shader_glsl_if,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index f617bcd..3e76592 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -100,6 +100,7 @@ static const char * const shader_opcode_names[] =
     /* WINED3DSIH_FTOU                          */ "ftou",
     /* WINED3DSIH_GE                            */ "ge",
     /* WINED3DSIH_HS_DECLS                      */ "hs_decls",
+    /* WINED3DSIH_HS_FORK_PHASE                 */ "hs_fork_phase",
     /* WINED3DSIH_IADD                          */ "iadd",
     /* WINED3DSIH_IEQ                           */ "ieq",
     /* WINED3DSIH_IF                            */ "if",
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index 502de7c..e00ea9b 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -185,6 +185,7 @@ enum wined3d_sm4_opcode
     WINED3D_SM4_OP_DCL_TEMPS                 = 0x68,
     WINED3D_SM4_OP_DCL_GLOBAL_FLAGS          = 0x6a,
     WINED3D_SM5_OP_HS_DECLS                  = 0x71,
+    WINED3D_SM5_OP_HS_FORK_PHASE             = 0x73,
     WINED3D_SM5_OP_DERIV_RTX_COARSE          = 0x7a,
     WINED3D_SM5_OP_DERIV_RTX_FINE            = 0x7b,
     WINED3D_SM5_OP_DERIV_RTY_COARSE          = 0x7c,
@@ -398,6 +399,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
     {WINED3D_SM4_OP_DCL_TEMPS,                 WINED3DSIH_DCL_TEMPS,                     "",     ""},
     {WINED3D_SM4_OP_DCL_GLOBAL_FLAGS,          WINED3DSIH_DCL_GLOBAL_FLAGS,              "",     ""},
     {WINED3D_SM5_OP_HS_DECLS,                  WINED3DSIH_HS_DECLS,                      "",     ""},
+    {WINED3D_SM5_OP_HS_FORK_PHASE,             WINED3DSIH_HS_FORK_PHASE,                 "",     ""},
     {WINED3D_SM5_OP_DERIV_RTX_COARSE,          WINED3DSIH_DSX_COARSE,                    "f",    "f"},
     {WINED3D_SM5_OP_DERIV_RTX_FINE,            WINED3DSIH_DSX_FINE,                      "f",    "f"},
     {WINED3D_SM5_OP_DERIV_RTY_COARSE,          WINED3DSIH_DSY_COARSE,                    "f",    "f"},
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 9f90d8d..1492392 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -556,6 +556,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
     WINED3DSIH_FTOU,
     WINED3DSIH_GE,
     WINED3DSIH_HS_DECLS,
+    WINED3DSIH_HS_FORK_PHASE,
     WINED3DSIH_IADD,
     WINED3DSIH_IEQ,
     WINED3DSIH_IF,
-- 
2.4.10




More information about the wine-patches mailing list