Józef Kucia : wined3d: Recognize SM5 store_structured opcode.

[Alexandre Julliard]

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

Author: Józef Kucia <jkucia(a)codeweavers.com>
Date:   Mon Jun 13 10:39:35 2016 +0200

wined3d: Recognize SM5 store_structured opcode.

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 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 ad38bfe..dc4b169 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5352,6 +5352,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
     /* WINED3DSIH_SLT                              */ shader_hw_map2gl,
     /* WINED3DSIH_SQRT                             */ NULL,
     /* WINED3DSIH_STORE_RAW                        */ NULL,
+    /* WINED3DSIH_STORE_STRUCTURED                 */ NULL,
     /* WINED3DSIH_STORE_UAV_TYPED                  */ NULL,
     /* WINED3DSIH_SUB                              */ shader_hw_map2gl,
     /* WINED3DSIH_SWITCH                           */ NULL,
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index ab53231..7dc8fb6 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -8686,6 +8686,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
     /* WINED3DSIH_SLT                              */ shader_glsl_compare,
     /* WINED3DSIH_SQRT                             */ shader_glsl_map2gl,
     /* WINED3DSIH_STORE_RAW                        */ NULL,
+    /* WINED3DSIH_STORE_STRUCTURED                 */ NULL,
     /* WINED3DSIH_STORE_UAV_TYPED                  */ NULL,
     /* WINED3DSIH_SUB                              */ shader_glsl_binop,
     /* WINED3DSIH_SWITCH                           */ shader_glsl_switch,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 57dbaef..9e8b8d3 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -184,6 +184,7 @@ static const char * const shader_opcode_names[] =
     /* WINED3DSIH_SLT                              */ "slt",
     /* WINED3DSIH_SQRT                             */ "sqrt",
     /* WINED3DSIH_STORE_RAW                        */ "store_raw",
+    /* WINED3DSIH_STORE_STRUCTURED                 */ "store_structured",
     /* WINED3DSIH_STORE_UAV_TYPED                  */ "store_uav_typed",
     /* WINED3DSIH_SUB                              */ "sub",
     /* WINED3DSIH_SWITCH                           */ "switch",
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index 885da50..c66379d 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -224,6 +224,7 @@ enum wined3d_sm4_opcode
     WINED3D_SM5_OP_LD_RAW                           = 0xa5,
     WINED3D_SM5_OP_STORE_RAW                        = 0xa6,
     WINED3D_SM5_OP_LD_STRUCTURED                    = 0xa7,
+    WINED3D_SM5_OP_STORE_STRUCTURED                 = 0xa8,
     WINED3D_SM5_OP_IMM_ATOMIC_CONSUME               = 0xb3,
 };
 
@@ -773,6 +774,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
     {WINED3D_SM5_OP_LD_RAW,                           WINED3DSIH_LD_RAW,                           "u",    "iU"},
     {WINED3D_SM5_OP_STORE_RAW,                        WINED3DSIH_STORE_RAW,                        "U",    "iu"},
     {WINED3D_SM5_OP_LD_STRUCTURED,                    WINED3DSIH_LD_STRUCTURED,                    "u",    "uuR"},
+    {WINED3D_SM5_OP_STORE_STRUCTURED,                 WINED3DSIH_STORE_STRUCTURED,                 "U",    "iiu"},
     {WINED3D_SM5_OP_IMM_ATOMIC_CONSUME,               WINED3DSIH_IMM_ATOMIC_CONSUME,               "u",    "U"},
 };
 
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 46899c2..f463ce4 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -692,6 +692,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
     WINED3DSIH_SLT,
     WINED3DSIH_SQRT,
     WINED3DSIH_STORE_RAW,
+    WINED3DSIH_STORE_STRUCTURED,
     WINED3DSIH_STORE_UAV_TYPED,
     WINED3DSIH_SUB,
     WINED3DSIH_SWITCH,