From 663dee140fdb5bbe940c0082d423848699331f65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zef=20Kucia?= Date: Mon, 5 Dec 2016 12:04:40 +0100 Subject: [PATCH] wined3d: Recognize SM5 imm_atomic_umin opcode. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 508f927be13..4b0449093cc 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5310,6 +5310,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL, + /* WINED3DSIH_IMM_ATOMIC_UMIN */ NULL, /* WINED3DSIH_IMM_ATOMIC_XOR */ NULL, /* WINED3DSIH_IMUL */ NULL, /* WINED3DSIH_INE */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 45c53b629c9..434444a29ec 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8973,6 +8973,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL, + /* WINED3DSIH_IMM_ATOMIC_UMIN */ NULL, /* WINED3DSIH_IMM_ATOMIC_XOR */ NULL, /* WINED3DSIH_IMUL */ shader_glsl_imul, /* WINED3DSIH_INE */ shader_glsl_relop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index bb2a2131a2c..a34694b4104 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -151,6 +151,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IMM_ATOMIC_EXCH */ "imm_atomic_exch", /* WINED3DSIH_IMM_ATOMIC_OR */ "imm_atomic_or", /* WINED3DSIH_IMM_ATOMIC_UMAX */ "imm_atomic_umax", + /* WINED3DSIH_IMM_ATOMIC_UMIN */ "imm_atomic_umin", /* WINED3DSIH_IMM_ATOMIC_XOR */ "imm_atomic_xor", /* WINED3DSIH_IMUL */ "imul", /* WINED3DSIH_INE */ "ine", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 11b17a6413f..d0497ce324f 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -266,6 +266,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_IMM_ATOMIC_EXCH = 0xb8, WINED3D_SM5_OP_IMM_ATOMIC_CMP_EXCH = 0xb9, WINED3D_SM5_OP_IMM_ATOMIC_UMAX = 0xbc, + WINED3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, WINED3D_SM5_OP_SYNC = 0xbe, }; @@ -923,6 +924,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_IMM_ATOMIC_EXCH, WINED3DSIH_IMM_ATOMIC_EXCH, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_CMP_EXCH, WINED3DSIH_IMM_ATOMIC_CMP_EXCH, "uU", "iuu"}, {WINED3D_SM5_OP_IMM_ATOMIC_UMAX, WINED3DSIH_IMM_ATOMIC_UMAX, "uU", "iu"}, + {WINED3D_SM5_OP_IMM_ATOMIC_UMIN, WINED3DSIH_IMM_ATOMIC_UMIN, "uU", "iu"}, {WINED3D_SM5_OP_SYNC, WINED3DSIH_SYNC, "", "", shader_sm5_read_sync}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3ece139f9dc..0e6dcb020bd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -677,6 +677,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IMM_ATOMIC_EXCH, WINED3DSIH_IMM_ATOMIC_OR, WINED3DSIH_IMM_ATOMIC_UMAX, + WINED3DSIH_IMM_ATOMIC_UMIN, WINED3DSIH_IMM_ATOMIC_XOR, WINED3DSIH_IMUL, WINED3DSIH_INE,