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

[Alexandre Julliard]

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

Author: Józef Kucia 
Date:   Fri Jun 17 10:41:49 2016 +0200

wined3d: Recognize SM5 ld_uav_typed 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 35fa23f..6810b21 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5307,6 +5307,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
     /* WINED3DSIH_LD2DMS                           */ NULL,
     /* WINED3DSIH_LD_RAW                           */ NULL,
     /* WINED3DSIH_LD_STRUCTURED                    */ NULL,
+    /* WINED3DSIH_LD_UAV_TYPED                     */ NULL,
     /* WINED3DSIH_LIT                              */ shader_hw_map2gl,
     /* WINED3DSIH_LOG                              */ shader_hw_scalar_op,
     /* WINED3DSIH_LOGP                             */ shader_hw_scalar_op,
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index dfcf5cf..cf4f72c 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -8641,6 +8641,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
     /* WINED3DSIH_LD2DMS                           */ NULL,
     /* WINED3DSIH_LD_RAW                           */ NULL,
     /* WINED3DSIH_LD_STRUCTURED                    */ NULL,
+    /* WINED3DSIH_LD_UAV_TYPED                     */ NULL,
     /* WINED3DSIH_LIT                              */ shader_glsl_lit,
     /* WINED3DSIH_LOG                              */ shader_glsl_scalar_op,
     /* WINED3DSIH_LOGP                             */ shader_glsl_scalar_op,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index b8adca1..33c6280 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -139,6 +139,7 @@ static const char * const shader_opcode_names[] =
     /* WINED3DSIH_LD2DMS                           */ "ld2dms",
     /* WINED3DSIH_LD_RAW                           */ "ld_raw",
     /* WINED3DSIH_LD_STRUCTURED                    */ "ld_structured",
+    /* WINED3DSIH_LD_UAV_TYPED                     */ "ld_uav_typed",
     /* WINED3DSIH_LIT                              */ "lit",
     /* WINED3DSIH_LOG                              */ "log",
     /* WINED3DSIH_LOGP                             */ "logp",
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index 6793883..18d345b 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -221,6 +221,7 @@ enum wined3d_sm4_opcode
     WINED3D_SM5_OP_DCL_HS_FORK_PHASE_INSTANCE_COUNT = 0x99,
     WINED3D_SM5_OP_DCL_UAV_TYPED                    = 0x9c,
     WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED          = 0xa2,
+    WINED3D_SM5_OP_LD_UAV_TYPED                     = 0xa3,
     WINED3D_SM5_OP_STORE_UAV_TYPED                  = 0xa4,
     WINED3D_SM5_OP_LD_RAW                           = 0xa5,
     WINED3D_SM5_OP_STORE_RAW                        = 0xa6,
@@ -773,6 +774,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
             shader_sm4_read_dcl_resource},
     {WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED,          WINED3DSIH_DCL_RESOURCE_STRUCTURED,          "",     "",
             shader_sm5_read_dcl_resource_structured},
+    {WINED3D_SM5_OP_LD_UAV_TYPED,                     WINED3DSIH_LD_UAV_TYPED,                     "u",    "iU"},
     {WINED3D_SM5_OP_STORE_UAV_TYPED,                  WINED3DSIH_STORE_UAV_TYPED,                  "U",    "iu"},
     {WINED3D_SM5_OP_LD_RAW,                           WINED3DSIH_LD_RAW,                           "u",    "iU"},
     {WINED3D_SM5_OP_STORE_RAW,                        WINED3DSIH_STORE_RAW,                        "U",    "iu"},
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 2669275..04dd160 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -647,6 +647,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
     WINED3DSIH_LD2DMS,
     WINED3DSIH_LD_RAW,
     WINED3DSIH_LD_STRUCTURED,
+    WINED3DSIH_LD_UAV_TYPED,
     WINED3DSIH_LIT,
     WINED3DSIH_LOG,
     WINED3DSIH_LOGP,