Module: wine Branch: master Commit: 7d9513974748e0185311955bfc209de0348b9ef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d9513974748e0185311955bfc...
Author: Józef Kucia jkucia@codeweavers.com Date: Mon Dec 5 12:04:38 2016 +0100
wined3d: Recognize SM5 atomic_umin 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 098eb99..3976c19 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5207,6 +5207,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ATOMIC_IADD */ NULL, /* WINED3DSIH_ATOMIC_OR */ NULL, /* WINED3DSIH_ATOMIC_UMAX */ NULL, + /* WINED3DSIH_ATOMIC_UMIN */ 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 81a66a3..b446659 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8870,6 +8870,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ATOMIC_IADD */ shader_glsl_atomic, /* WINED3DSIH_ATOMIC_OR */ NULL, /* WINED3DSIH_ATOMIC_UMAX */ NULL, + /* WINED3DSIH_ATOMIC_UMIN */ 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 6bb7c9a..e070d69 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -48,6 +48,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_ATOMIC_IADD */ "atomic_iadd", /* WINED3DSIH_ATOMIC_OR */ "atomic_or", /* WINED3DSIH_ATOMIC_UMAX */ "atomic_umax", + /* WINED3DSIH_ATOMIC_UMIN */ "atomic_umin", /* 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 d4d3173..6d8a0db 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -257,6 +257,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_ATOMIC_CMP_STORE = 0xac, WINED3D_SM5_OP_ATOMIC_IADD = 0xad, WINED3D_SM5_OP_ATOMIC_UMAX = 0xb0, + WINED3D_SM5_OP_ATOMIC_UMIN = 0xb1, WINED3D_SM5_OP_IMM_ATOMIC_ALLOC = 0xb2, WINED3D_SM5_OP_IMM_ATOMIC_CONSUME = 0xb3, WINED3D_SM5_OP_IMM_ATOMIC_AND = 0xb5, @@ -912,6 +913,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_ATOMIC_CMP_STORE, WINED3DSIH_ATOMIC_CMP_STORE, "U", "iuu"}, {WINED3D_SM5_OP_ATOMIC_IADD, WINED3DSIH_ATOMIC_IADD, "U", "ii"}, {WINED3D_SM5_OP_ATOMIC_UMAX, WINED3DSIH_ATOMIC_UMAX, "U", "iu"}, + {WINED3D_SM5_OP_ATOMIC_UMIN, WINED3DSIH_ATOMIC_UMIN, "U", "iu"}, {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_AND, WINED3DSIH_IMM_ATOMIC_AND, "uU", "iu"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0c1ff71..4610a7c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -574,6 +574,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_ATOMIC_IADD, WINED3DSIH_ATOMIC_OR, WINED3DSIH_ATOMIC_UMAX, + WINED3DSIH_ATOMIC_UMIN, WINED3DSIH_ATOMIC_XOR, WINED3DSIH_BEM, WINED3DSIH_BFI,
-
Alexandre Julliard