Henri Verbeet : wined3d: Recognize the SM4 ld opcode.

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Wed Oct 13 12:26:32 2010 +0200

wined3d: Recognize the SM4 ld 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 3fe8653..a34b506 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -4972,6 +4972,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
     /* WINED3DSIH_IMUL          */ NULL,
     /* WINED3DSIH_ITOF          */ NULL,
     /* WINED3DSIH_LABEL         */ shader_hw_label,
+    /* WINED3DSIH_LD            */ NULL,
     /* WINED3DSIH_LIT           */ shader_hw_map2gl,
     /* WINED3DSIH_LOG           */ shader_hw_log_pow,
     /* WINED3DSIH_LOGP          */ shader_hw_log_pow,
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 237150f..facb686 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -5030,6 +5030,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
     /* WINED3DSIH_IMUL          */ NULL,
     /* WINED3DSIH_ITOF          */ NULL,
     /* WINED3DSIH_LABEL         */ shader_glsl_label,
+    /* WINED3DSIH_LD            */ NULL,
     /* WINED3DSIH_LIT           */ shader_glsl_lit,
     /* WINED3DSIH_LOG           */ shader_glsl_log,
     /* WINED3DSIH_LOGP          */ shader_glsl_log,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 5f6bc0b..2e57e9f 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -76,6 +76,7 @@ static const char * const shader_opcode_names[] =
     /* WINED3DSIH_IMUL          */ "imul",
     /* WINED3DSIH_ITOF          */ "itof",
     /* WINED3DSIH_LABEL         */ "label",
+    /* WINED3DSIH_LD            */ "ld",
     /* WINED3DSIH_LIT           */ "lit",
     /* WINED3DSIH_LOG           */ "log",
     /* WINED3DSIH_LOGP          */ "logp",
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index e64f38b..080f53b 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -72,6 +72,7 @@ enum wined3d_sm4_opcode
     WINED3D_SM4_OP_IGE          = 0x21,
     WINED3D_SM4_OP_IMUL         = 0x26,
     WINED3D_SM4_OP_ITOF         = 0x2b,
+    WINED3D_SM4_OP_LD           = 0x2d,
     WINED3D_SM4_OP_LOG          = 0x2f,
     WINED3D_SM4_OP_LOOP         = 0x30,
     WINED3D_SM4_OP_LT           = 0x31,
@@ -150,6 +151,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
     {WINED3D_SM4_OP_IGE,        WINED3DSIH_IGE,         1,  2},
     {WINED3D_SM4_OP_IMUL,       WINED3DSIH_IMUL,        2,  2},
     {WINED3D_SM4_OP_ITOF,       WINED3DSIH_ITOF,        1,  1},
+    {WINED3D_SM4_OP_LD,         WINED3DSIH_LD,          1,  2},
     {WINED3D_SM4_OP_LOG,        WINED3DSIH_LOG,         1,  1},
     {WINED3D_SM4_OP_LOOP,       WINED3DSIH_LOOP,        0,  0},
     {WINED3D_SM4_OP_LT,         WINED3DSIH_LT,          1,  2},
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 5dba59d..c648bd9 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -445,6 +445,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
     WINED3DSIH_IMUL,
     WINED3DSIH_ITOF,
     WINED3DSIH_LABEL,
+    WINED3DSIH_LD,
     WINED3DSIH_LIT,
     WINED3DSIH_LOG,
     WINED3DSIH_LOGP,