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

[Alexandre Julliard]

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

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Mon Dec  5 12:04:30 2016 +0100

wined3d: Recognize SM5 atomic_or 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 5ddbc3f..20377bd 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5203,6 +5203,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
     /* WINED3DSIH_ADD                              */ shader_hw_map2gl,
     /* WINED3DSIH_AND                              */ NULL,
     /* WINED3DSIH_ATOMIC_IADD                      */ NULL,
+    /* WINED3DSIH_ATOMIC_OR                        */ NULL,
     /* WINED3DSIH_ATOMIC_XOR                       */ NULL,
     /* WINED3DSIH_BEM                              */ pshader_hw_bem,
     /* WINED3DSIH_BFI                              */ NULL,
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index aab1916..b66c17f 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -8866,6 +8866,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
     /* WINED3DSIH_ADD                              */ shader_glsl_binop,
     /* WINED3DSIH_AND                              */ shader_glsl_binop,
     /* WINED3DSIH_ATOMIC_IADD                      */ shader_glsl_atomic,
+    /* WINED3DSIH_ATOMIC_OR                        */ NULL,
     /* WINED3DSIH_ATOMIC_XOR                       */ NULL,
     /* WINED3DSIH_BEM                              */ shader_glsl_bem,
     /* WINED3DSIH_BFI                              */ NULL,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 48393d6..58202b5 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -44,6 +44,7 @@ static const char * const shader_opcode_names[] =
     /* WINED3DSIH_ADD                              */ "add",
     /* WINED3DSIH_AND                              */ "and",
     /* WINED3DSIH_ATOMIC_IADD                      */ "atomic_iadd",
+    /* WINED3DSIH_ATOMIC_OR                        */ "atomic_or",
     /* WINED3DSIH_ATOMIC_XOR                       */ "atomic_xor",
     /* WINED3DSIH_BEM                              */ "bem",
     /* WINED3DSIH_BFI                              */ "bfi",
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index 4c58e61..5e8e78e 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -251,6 +251,7 @@ enum wined3d_sm4_opcode
     WINED3D_SM5_OP_STORE_RAW                        = 0xa6,
     WINED3D_SM5_OP_LD_STRUCTURED                    = 0xa7,
     WINED3D_SM5_OP_STORE_STRUCTURED                 = 0xa8,
+    WINED3D_SM5_OP_ATOMIC_OR                        = 0xaa,
     WINED3D_SM5_OP_ATOMIC_XOR                       = 0xab,
     WINED3D_SM5_OP_ATOMIC_IADD                      = 0xad,
     WINED3D_SM5_OP_IMM_ATOMIC_ALLOC                 = 0xb2,
@@ -898,6 +899,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
     {WINED3D_SM5_OP_STORE_RAW,                        WINED3DSIH_STORE_RAW,                        "U",    "iu"},
     {WINED3D_SM5_OP_LD_STRUCTURED,                    WINED3DSIH_LD_STRUCTURED,                    "u",    "iiR"},
     {WINED3D_SM5_OP_STORE_STRUCTURED,                 WINED3DSIH_STORE_STRUCTURED,                 "U",    "iiu"},
+    {WINED3D_SM5_OP_ATOMIC_OR,                        WINED3DSIH_ATOMIC_OR,                        "U",    "iu"},
     {WINED3D_SM5_OP_ATOMIC_XOR,                       WINED3DSIH_ATOMIC_XOR,                       "U",    "iu"},
     {WINED3D_SM5_OP_ATOMIC_IADD,                      WINED3DSIH_ATOMIC_IADD,                      "U",    "ii"},
     {WINED3D_SM5_OP_IMM_ATOMIC_ALLOC,                 WINED3DSIH_IMM_ATOMIC_ALLOC,                 "u",    "U"},
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 46a93bd..d38a64e 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -570,6 +570,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
     WINED3DSIH_ADD,
     WINED3DSIH_AND,
     WINED3DSIH_ATOMIC_IADD,
+    WINED3DSIH_ATOMIC_OR,
     WINED3DSIH_ATOMIC_XOR,
     WINED3DSIH_BEM,
     WINED3DSIH_BFI,