[PATCH 2/5] wined3d: Recognize the SM4 ge opcode.

Henri Verbeet hverbeet at codeweavers.com
Sun Nov 20 13:27:10 CST 2011


---
 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(+), 0 deletions(-)

diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 2399c82..34775a5 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5058,6 +5058,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_GE            */ 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 3e5efad..5e4153f 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -5013,6 +5013,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
     /* WINED3DSIH_EXPP          */ shader_glsl_expp,
     /* WINED3DSIH_FRC           */ shader_glsl_map2gl,
     /* WINED3DSIH_FTOI          */ NULL,
+    /* WINED3DSIH_GE            */ NULL,
     /* WINED3DSIH_IADD          */ NULL,
     /* WINED3DSIH_IEQ           */ NULL,
     /* WINED3DSIH_IF            */ shader_glsl_if,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 3386070..a82c13c 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -69,6 +69,7 @@ static const char * const shader_opcode_names[] =
     /* WINED3DSIH_EXPP          */ "expp",
     /* WINED3DSIH_FRC           */ "frc",
     /* WINED3DSIH_FTOI          */ "ftoi",
+    /* WINED3DSIH_GE            */ "ge",
     /* WINED3DSIH_IADD          */ "iadd",
     /* WINED3DSIH_IEQ           */ "ieq",
     /* WINED3DSIH_IF            */ "if",
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index 5739e1d..c9a96fc 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -69,6 +69,7 @@ enum wined3d_sm4_opcode
     WINED3D_SM4_OP_EXP          = 0x19,
     WINED3D_SM4_OP_FRC          = 0x1a,
     WINED3D_SM4_OP_FTOI         = 0x1b,
+    WINED3D_SM4_OP_GE           = 0x1d,
     WINED3D_SM4_OP_IADD         = 0x1e,
     WINED3D_SM4_OP_IF           = 0x1f,
     WINED3D_SM4_OP_IEQ          = 0x20,
@@ -153,6 +154,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
     {WINED3D_SM4_OP_EXP,        WINED3DSIH_EXP,         1,  1},
     {WINED3D_SM4_OP_FRC,        WINED3DSIH_FRC,         1,  1},
     {WINED3D_SM4_OP_FTOI,       WINED3DSIH_FTOI,        1,  1},
+    {WINED3D_SM4_OP_GE,         WINED3DSIH_GE,          1,  2},
     {WINED3D_SM4_OP_IADD,       WINED3DSIH_IADD,        1,  2},
     {WINED3D_SM4_OP_IF,         WINED3DSIH_IF,          0,  1},
     {WINED3D_SM4_OP_IEQ,        WINED3DSIH_IEQ,         1,  2},
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 5c4debc..3a30c4d 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -442,6 +442,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
     WINED3DSIH_EXPP,
     WINED3DSIH_FRC,
     WINED3DSIH_FTOI,
+    WINED3DSIH_GE,
     WINED3DSIH_IADD,
     WINED3DSIH_IEQ,
     WINED3DSIH_IF,
-- 
1.7.3.4




More information about the wine-patches mailing list