=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Implement [imm_]atomic_{imax, imin} instructions for signed integers.

[Alexandre Julliard]

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

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Sun Feb 26 18:48:03 2017 +0100

wined3d: Implement [imm_]atomic_{imax, imin} instructions for signed integers.

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/glsl_shader.c | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index a2fcda3..025ba1d 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -4996,6 +4996,24 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins)
         case WINED3DSIH_IMM_ATOMIC_IADD:
             op = "imageAtomicAdd";
             break;
+        case WINED3DSIH_ATOMIC_IMAX:
+        case WINED3DSIH_IMM_ATOMIC_IMAX:
+            op = "imageAtomicMax";
+            if (data_type != WINED3D_DATA_INT)
+            {
+                FIXME("Unhandled opcode %#x for unsigned integers.\n", ins->handler_idx);
+                return;
+            }
+            break;
+        case WINED3DSIH_ATOMIC_IMIN:
+        case WINED3DSIH_IMM_ATOMIC_IMIN:
+            op = "imageAtomicMin";
+            if (data_type != WINED3D_DATA_INT)
+            {
+                FIXME("Unhandled opcode %#x for unsigned integers.\n", ins->handler_idx);
+                return;
+            }
+            break;
         case WINED3DSIH_ATOMIC_OR:
         case WINED3DSIH_IMM_ATOMIC_OR:
             op = "imageAtomicOr";
@@ -9368,8 +9386,8 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
     /* WINED3DSIH_ATOMIC_AND                       */ shader_glsl_atomic,
     /* WINED3DSIH_ATOMIC_CMP_STORE                 */ shader_glsl_atomic,
     /* WINED3DSIH_ATOMIC_IADD                      */ shader_glsl_atomic,
-    /* WINED3DSIH_ATOMIC_IMAX                      */ NULL,
-    /* WINED3DSIH_ATOMIC_IMIN                      */ NULL,
+    /* WINED3DSIH_ATOMIC_IMAX                      */ shader_glsl_atomic,
+    /* WINED3DSIH_ATOMIC_IMIN                      */ shader_glsl_atomic,
     /* WINED3DSIH_ATOMIC_OR                        */ shader_glsl_atomic,
     /* WINED3DSIH_ATOMIC_UMAX                      */ shader_glsl_atomic,
     /* WINED3DSIH_ATOMIC_UMIN                      */ shader_glsl_atomic,
@@ -9485,8 +9503,8 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
     /* WINED3DSIH_IMM_ATOMIC_CONSUME               */ NULL,
     /* WINED3DSIH_IMM_ATOMIC_EXCH                  */ shader_glsl_atomic,
     /* WINED3DSIH_IMM_ATOMIC_IADD                  */ shader_glsl_atomic,
-    /* WINED3DSIH_IMM_ATOMIC_IMAX                  */ NULL,
-    /* WINED3DSIH_IMM_ATOMIC_IMIN                  */ NULL,
+    /* WINED3DSIH_IMM_ATOMIC_IMAX                  */ shader_glsl_atomic,
+    /* WINED3DSIH_IMM_ATOMIC_IMIN                  */ shader_glsl_atomic,
     /* WINED3DSIH_IMM_ATOMIC_OR                    */ shader_glsl_atomic,
     /* WINED3DSIH_IMM_ATOMIC_UMAX                  */ shader_glsl_atomic,
     /* WINED3DSIH_IMM_ATOMIC_UMIN                  */ shader_glsl_atomic,