Module: wine Branch: master Commit: 1ff716d83f7255b55fbdc701a101abd13985285a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ff716d83f7255b55fbdc701a1...
Author: Józef Kucia jkucia@codeweavers.com Date: Mon Dec 5 12:04:34 2016 +0100
wined3d: Recognize SM5 imm_atomic_exch opcode.
Signed-off-by: Józef Kucia jkucia@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@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 4989752..3ceff11 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5303,6 +5303,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IMM_ATOMIC_ALLOC */ NULL, /* WINED3DSIH_IMM_ATOMIC_AND */ NULL, /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, + /* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ NULL, /* WINED3DSIH_IMM_ATOMIC_XOR */ NULL, /* WINED3DSIH_IMUL */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7daa67b..de23acb 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8966,6 +8966,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMM_ATOMIC_ALLOC */ NULL, /* WINED3DSIH_IMM_ATOMIC_AND */ NULL, /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, + /* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ NULL, /* WINED3DSIH_IMM_ATOMIC_XOR */ NULL, /* WINED3DSIH_IMUL */ shader_glsl_imul, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 6dd5e6b..8105e26 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -144,6 +144,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IMM_ATOMIC_ALLOC */ "imm_atomic_alloc", /* WINED3DSIH_IMM_ATOMIC_AND */ "imm_atomic_and", /* WINED3DSIH_IMM_ATOMIC_CONSUME */ "imm_atomic_consume", + /* WINED3DSIH_IMM_ATOMIC_EXCH */ "imm_atomic_exch", /* WINED3DSIH_IMM_ATOMIC_OR */ "imm_atomic_or", /* WINED3DSIH_IMM_ATOMIC_XOR */ "imm_atomic_xor", /* WINED3DSIH_IMUL */ "imul", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index ed0c8f1..9b85b46 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -260,6 +260,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_IMM_ATOMIC_AND = 0xb5, WINED3D_SM5_OP_IMM_ATOMIC_OR = 0xb6, WINED3D_SM5_OP_IMM_ATOMIC_XOR = 0xb7, + WINED3D_SM5_OP_IMM_ATOMIC_EXCH = 0xb8, WINED3D_SM5_OP_SYNC = 0xbe, };
@@ -911,6 +912,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_IMM_ATOMIC_AND, WINED3DSIH_IMM_ATOMIC_AND, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_OR, WINED3DSIH_IMM_ATOMIC_OR, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_XOR, WINED3DSIH_IMM_ATOMIC_XOR, "uU", "iu"}, + {WINED3D_SM5_OP_IMM_ATOMIC_EXCH, WINED3DSIH_IMM_ATOMIC_EXCH, "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 b5557c9..024ee0d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -670,6 +670,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_AND, WINED3DSIH_IMM_ATOMIC_CONSUME, + WINED3DSIH_IMM_ATOMIC_EXCH, WINED3DSIH_IMM_ATOMIC_OR, WINED3DSIH_IMM_ATOMIC_XOR, WINED3DSIH_IMUL,
-
Alexandre Julliard