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

[Alexandre Julliard]

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

Author: Józef Kucia 
Date:   Fri Mar 25 19:53:39 2016 +0100

wined3d: Recognize SM5 store_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 8ef944d..298107a 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5334,6 +5334,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
     /* WINED3DSIH_SINCOS                        */ shader_hw_sincos,
     /* WINED3DSIH_SLT                           */ shader_hw_map2gl,
     /* WINED3DSIH_SQRT                          */ NULL,
+    /* WINED3DSIH_STORE_UAV_TYPED               */ NULL,
     /* WINED3DSIH_SUB                           */ shader_hw_map2gl,
     /* WINED3DSIH_TEX                           */ pshader_hw_tex,
     /* WINED3DSIH_TEXBEM                        */ pshader_hw_texbem,
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 716650a..53a9191 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -8220,6 +8220,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
     /* WINED3DSIH_SINCOS                        */ shader_glsl_sincos,
     /* WINED3DSIH_SLT                           */ shader_glsl_compare,
     /* WINED3DSIH_SQRT                          */ shader_glsl_map2gl,
+    /* WINED3DSIH_STORE_UAV_TYPED               */ NULL,
     /* WINED3DSIH_SUB                           */ shader_glsl_binop,
     /* WINED3DSIH_TEX                           */ shader_glsl_tex,
     /* WINED3DSIH_TEXBEM                        */ shader_glsl_texbem,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 5aded18..7120a7f 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -162,6 +162,7 @@ static const char * const shader_opcode_names[] =
     /* WINED3DSIH_SINCOS                        */ "sincos",
     /* WINED3DSIH_SLT                           */ "slt",
     /* WINED3DSIH_SQRT                          */ "sqrt",
+    /* WINED3DSIH_STORE_UAV_TYPED               */ "store_uav_typed",
     /* WINED3DSIH_SUB                           */ "sub",
     /* WINED3DSIH_TEX                           */ "texld",
     /* WINED3DSIH_TEXBEM                        */ "texbem",
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index cb3f18e..51110f8 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -190,6 +190,7 @@ enum wined3d_sm4_opcode
     WINED3D_SM5_OP_DERIV_RTY_FINE            = 0x7d,
     WINED3D_SM5_OP_DCL_UAV_TYPED             = 0x9c,
     WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED   = 0xa2,
+    WINED3D_SM5_OP_STORE_UAV_TYPED           = 0xa4,
     WINED3D_SM5_OP_LD_STRUCTURED             = 0xa7,
 };

@@ -401,6 +402,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
     {WINED3D_SM5_OP_DERIV_RTY_FINE,            WINED3DSIH_DSY_FINE,                      "f",    "f"},
     {WINED3D_SM5_OP_DCL_UAV_TYPED,             WINED3DSIH_DCL_UAV_TYPED,                 "",     ""},
     {WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED,   WINED3DSIH_DCL_RESOURCE_STRUCTURED,       "",     ""},
+    {WINED3D_SM5_OP_STORE_UAV_TYPED,           WINED3DSIH_STORE_UAV_TYPED,               "",     "Uif"},
     {WINED3D_SM5_OP_LD_STRUCTURED,             WINED3DSIH_LD_STRUCTURED,                 "u",    "uuR"},
 };

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index d2970c4..229f6fd 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -616,6 +616,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
     WINED3DSIH_SINCOS,
     WINED3DSIH_SLT,
     WINED3DSIH_SQRT,
+    WINED3DSIH_STORE_UAV_TYPED,
     WINED3DSIH_SUB,
     WINED3DSIH_TEX,
     WINED3DSIH_TEXBEM,