Józef Kucia : wined3d: Recognize SM4 ftou opcode.

[Alexandre Julliard]

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

Author: Józef Kucia 
Date:   Mon Jan 11 11:53:20 2016 +0100

wined3d: Recognize SM4 ftou opcode.

Signed-off-by: Józef Kucia 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

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 59780f8..6b67c7d 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5251,6 +5251,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
     /* WINED3DSIH_EXPP                  */ shader_hw_scalar_op,
     /* WINED3DSIH_FRC                   */ shader_hw_map2gl,
     /* WINED3DSIH_FTOI                  */ NULL,
+    /* WINED3DSIH_FTOU                  */ NULL,
     /* WINED3DSIH_GE                    */ NULL,
     /* WINED3DSIH_IADD                  */ NULL,
     /* WINED3DSIH_IEQ                   */ NULL,
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 66a541a..a18e7a8 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -7899,6 +7899,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
     /* WINED3DSIH_EXPP                  */ shader_glsl_expp,
     /* WINED3DSIH_FRC                   */ shader_glsl_map2gl,
     /* WINED3DSIH_FTOI                  */ shader_glsl_to_int,
+    /* WINED3DSIH_FTOU                  */ NULL,
     /* WINED3DSIH_GE                    */ shader_glsl_relop,
     /* WINED3DSIH_IADD                  */ shader_glsl_binop,
     /* WINED3DSIH_IEQ                   */ NULL,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 6aa5bd5..d63a377 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -79,6 +79,7 @@ static const char * const shader_opcode_names[] =
     /* WINED3DSIH_EXPP                  */ "expp",
     /* WINED3DSIH_FRC                   */ "frc",
     /* WINED3DSIH_FTOI                  */ "ftoi",
+    /* WINED3DSIH_FTOU                  */ "ftou",
     /* WINED3DSIH_GE                    */ "ge",
     /* WINED3DSIH_IADD                  */ "iadd",
     /* WINED3DSIH_IEQ                   */ "ieq",
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index d0d6291..c1f20b0 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -93,6 +93,7 @@ enum wined3d_sm4_opcode
     WINED3D_SM4_OP_EXP                  = 0x19,
     WINED3D_SM4_OP_FRC                  = 0x1a,
     WINED3D_SM4_OP_FTOI                 = 0x1b,
+    WINED3D_SM4_OP_FTOU                 = 0x1c,
     WINED3D_SM4_OP_GE                   = 0x1d,
     WINED3D_SM4_OP_IADD                 = 0x1e,
     WINED3D_SM4_OP_IF                   = 0x1f,
@@ -264,6 +265,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
     {WINED3D_SM4_OP_EXP,                    WINED3DSIH_EXP,                 "F",    "F"},
     {WINED3D_SM4_OP_FRC,                    WINED3DSIH_FRC,                 "F",    "F"},
     {WINED3D_SM4_OP_FTOI,                   WINED3DSIH_FTOI,                "I",    "F"},
+    {WINED3D_SM4_OP_FTOU,                   WINED3DSIH_FTOU,                "U",    "F"},
     {WINED3D_SM4_OP_GE,                     WINED3DSIH_GE,                  "U",    "FF"},
     {WINED3D_SM4_OP_IADD,                   WINED3DSIH_IADD,                "I",    "II"},
     {WINED3D_SM4_OP_IF,                     WINED3DSIH_IF,                  "",     "U"},
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 805e32e..86f4123 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -494,6 +494,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
     WINED3DSIH_EXPP,
     WINED3DSIH_FRC,
     WINED3DSIH_FTOI,
+    WINED3DSIH_FTOU,
     WINED3DSIH_GE,
     WINED3DSIH_IADD,
     WINED3DSIH_IEQ,