=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Recognize SM5 imm_atomic_consume opcode.

[Alexandre Julliard]

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

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Mon Jun 13 10:39:33 2016 +0200

wined3d: Recognize SM5 imm_atomic_consume opcode.

Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at 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 2b4bf45..7bdf0ee 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5292,6 +5292,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
     /* WINED3DSIH_IMAD                             */ NULL,
     /* WINED3DSIH_IMAX                             */ NULL,
     /* WINED3DSIH_IMIN                             */ NULL,
+    /* WINED3DSIH_IMM_ATOMIC_CONSUME               */ NULL,
     /* WINED3DSIH_IMUL                             */ NULL,
     /* WINED3DSIH_INE                              */ NULL,
     /* WINED3DSIH_INEG                             */ NULL,
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index c8f7608..e0c7c65 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -8626,6 +8626,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
     /* WINED3DSIH_IMAD                             */ shader_glsl_mad,
     /* WINED3DSIH_IMAX                             */ shader_glsl_map2gl,
     /* WINED3DSIH_IMIN                             */ shader_glsl_map2gl,
+    /* WINED3DSIH_IMM_ATOMIC_CONSUME               */ NULL,
     /* WINED3DSIH_IMUL                             */ shader_glsl_imul,
     /* WINED3DSIH_INE                              */ shader_glsl_relop,
     /* WINED3DSIH_INEG                             */ shader_glsl_unary_op,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index faae82f..a93a2f1 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -124,6 +124,7 @@ static const char * const shader_opcode_names[] =
     /* WINED3DSIH_IMAD                             */ "imad",
     /* WINED3DSIH_IMAX                             */ "imax",
     /* WINED3DSIH_IMIN                             */ "imin",
+    /* WINED3DSIH_IMM_ATOMIC_CONSUME               */ "imm_atomic_consume",
     /* WINED3DSIH_IMUL                             */ "imul",
     /* WINED3DSIH_INE                              */ "ine",
     /* WINED3DSIH_INEG                             */ "ineg",
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index 7564850..888f341 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -223,6 +223,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_IMM_ATOMIC_CONSUME               = 0xb3,
 };
 
 enum wined3d_sm4_register_type
@@ -770,6 +771,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_IMM_ATOMIC_CONSUME,               WINED3DSIH_IMM_ATOMIC_CONSUME,               "u",    "U"},
 };
 
 static const enum wined3d_shader_register_type register_type_table[] =
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 93e9ab4..9eba0ff 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -632,6 +632,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
     WINED3DSIH_IMAD,
     WINED3DSIH_IMAX,
     WINED3DSIH_IMIN,
+    WINED3DSIH_IMM_ATOMIC_CONSUME,
     WINED3DSIH_IMUL,
     WINED3DSIH_INE,
     WINED3DSIH_INEG,