Henri Verbeet : wined3d: Recognize the SM4 ieq opcode.

Alexandre Julliard julliard at winehq.org
Wed Oct 13 11:43:09 CDT 2010


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Wed Oct 13 12:26:31 2010 +0200

wined3d: Recognize the SM4 ieq opcode.

---

 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 a36a1e4..3fe8653 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -4965,6 +4965,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
     /* WINED3DSIH_FRC           */ shader_hw_map2gl,
     /* WINED3DSIH_FTOI          */ NULL,
     /* WINED3DSIH_IADD          */ NULL,
+    /* WINED3DSIH_IEQ           */ NULL,
     /* WINED3DSIH_IF            */ NULL /* Hardcoded into the shader */,
     /* WINED3DSIH_IFC           */ shader_hw_ifc,
     /* WINED3DSIH_IGE           */ NULL,
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 305f251..237150f 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -5023,6 +5023,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
     /* WINED3DSIH_FRC           */ shader_glsl_map2gl,
     /* WINED3DSIH_FTOI          */ NULL,
     /* WINED3DSIH_IADD          */ NULL,
+    /* WINED3DSIH_IEQ           */ NULL,
     /* WINED3DSIH_IF            */ shader_glsl_if,
     /* WINED3DSIH_IFC           */ shader_glsl_ifc,
     /* WINED3DSIH_IGE           */ NULL,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index c671920..5f6bc0b 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -69,6 +69,7 @@ static const char * const shader_opcode_names[] =
     /* WINED3DSIH_FRC           */ "frc",
     /* WINED3DSIH_FTOI          */ "ftoi",
     /* WINED3DSIH_IADD          */ "iadd",
+    /* WINED3DSIH_IEQ           */ "ieq",
     /* WINED3DSIH_IF            */ "if",
     /* WINED3DSIH_IFC           */ "ifc",
     /* WINED3DSIH_IGE           */ "ige",
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index d3fb74f..e64f38b 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -68,6 +68,7 @@ enum wined3d_sm4_opcode
     WINED3D_SM4_OP_FTOI         = 0x1b,
     WINED3D_SM4_OP_IADD         = 0x1e,
     WINED3D_SM4_OP_IF           = 0x1f,
+    WINED3D_SM4_OP_IEQ          = 0x20,
     WINED3D_SM4_OP_IGE          = 0x21,
     WINED3D_SM4_OP_IMUL         = 0x26,
     WINED3D_SM4_OP_ITOF         = 0x2b,
@@ -145,6 +146,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
     {WINED3D_SM4_OP_FTOI,       WINED3DSIH_FTOI,        1,  1},
     {WINED3D_SM4_OP_IADD,       WINED3DSIH_IADD,        1,  2},
     {WINED3D_SM4_OP_IF,         WINED3DSIH_IF,          0,  1},
+    {WINED3D_SM4_OP_IEQ,        WINED3DSIH_IEQ,         1,  2},
     {WINED3D_SM4_OP_IGE,        WINED3DSIH_IGE,         1,  2},
     {WINED3D_SM4_OP_IMUL,       WINED3DSIH_IMUL,        2,  2},
     {WINED3D_SM4_OP_ITOF,       WINED3DSIH_ITOF,        1,  1},
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 1a3841b..5dba59d 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -438,6 +438,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
     WINED3DSIH_FRC,
     WINED3DSIH_FTOI,
     WINED3DSIH_IADD,
+    WINED3DSIH_IEQ,
     WINED3DSIH_IF,
     WINED3DSIH_IFC,
     WINED3DSIH_IGE,




More information about the wine-cvs mailing list