From bde5cc79fb6d415d7adb9ff407d08b3682c9077a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zef=20Kucia?= Date: Mon, 5 Dec 2016 12:04:29 +0100 Subject: [PATCH] wined3d: Recognize SM5 imm_atomic_xor 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 8c8d0fd560a..5ddbc3f8306 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5300,6 +5300,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IMIN */ NULL, /* WINED3DSIH_IMM_ATOMIC_ALLOC */ NULL, /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, + /* WINED3DSIH_IMM_ATOMIC_XOR */ 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 f2610f58792..aab19160451 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8963,6 +8963,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMIN */ shader_glsl_map2gl, /* WINED3DSIH_IMM_ATOMIC_ALLOC */ NULL, /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, + /* WINED3DSIH_IMM_ATOMIC_XOR */ 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 553328abfd2..48393d6e232 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -141,6 +141,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IMIN */ "imin", /* WINED3DSIH_IMM_ATOMIC_ALLOC */ "imm_atomic_alloc", /* WINED3DSIH_IMM_ATOMIC_CONSUME */ "imm_atomic_consume", + /* WINED3DSIH_IMM_ATOMIC_XOR */ "imm_atomic_xor", /* WINED3DSIH_IMUL */ "imul", /* WINED3DSIH_INE */ "ine", /* WINED3DSIH_INEG */ "ineg", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 55eb6256bd9..4c58e6156ce 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -255,6 +255,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_ATOMIC_IADD = 0xad, WINED3D_SM5_OP_IMM_ATOMIC_ALLOC = 0xb2, WINED3D_SM5_OP_IMM_ATOMIC_CONSUME = 0xb3, + WINED3D_SM5_OP_IMM_ATOMIC_XOR = 0xb7, WINED3D_SM5_OP_SYNC = 0xbe, }; @@ -901,6 +902,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_ATOMIC_IADD, WINED3DSIH_ATOMIC_IADD, "U", "ii"}, {WINED3D_SM5_OP_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_ALLOC, "u", "U"}, {WINED3D_SM5_OP_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_CONSUME, "u", "U"}, + {WINED3D_SM5_OP_IMM_ATOMIC_XOR, WINED3DSIH_IMM_ATOMIC_XOR, "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 e29dd62500d..46a93bdbf47 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -667,6 +667,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IMIN, WINED3DSIH_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_CONSUME, + WINED3DSIH_IMM_ATOMIC_XOR, WINED3DSIH_IMUL, WINED3DSIH_INE, WINED3DSIH_INEG,