Module: wine Branch: master Commit: d9b8bd891fe3f8e6a805fd7077aa0068501595a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9b8bd891fe3f8e6a805fd7077...
Author: Józef Kucia jkucia@codeweavers.com Date: Mon Dec 5 12:04:32 2016 +0100
wined3d: Recognize SM5 atomic_and 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 20377bd..e58425a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5202,6 +5202,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ABS */ shader_hw_map2gl, /* WINED3DSIH_ADD */ shader_hw_map2gl, /* WINED3DSIH_AND */ NULL, + /* WINED3DSIH_ATOMIC_AND */ NULL, /* WINED3DSIH_ATOMIC_IADD */ NULL, /* WINED3DSIH_ATOMIC_OR */ NULL, /* WINED3DSIH_ATOMIC_XOR */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b66c17f..455756c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8865,6 +8865,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ABS */ shader_glsl_map2gl, /* WINED3DSIH_ADD */ shader_glsl_binop, /* WINED3DSIH_AND */ shader_glsl_binop, + /* WINED3DSIH_ATOMIC_AND */ NULL, /* WINED3DSIH_ATOMIC_IADD */ shader_glsl_atomic, /* WINED3DSIH_ATOMIC_OR */ NULL, /* WINED3DSIH_ATOMIC_XOR */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 58202b5..ae996c0 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -43,6 +43,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_ABS */ "abs", /* WINED3DSIH_ADD */ "add", /* WINED3DSIH_AND */ "and", + /* WINED3DSIH_ATOMIC_AND */ "atomic_and", /* WINED3DSIH_ATOMIC_IADD */ "atomic_iadd", /* WINED3DSIH_ATOMIC_OR */ "atomic_or", /* WINED3DSIH_ATOMIC_XOR */ "atomic_xor", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 5e8e78e..b056118 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -251,6 +251,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_STORE_RAW = 0xa6, WINED3D_SM5_OP_LD_STRUCTURED = 0xa7, WINED3D_SM5_OP_STORE_STRUCTURED = 0xa8, + WINED3D_SM5_OP_ATOMIC_AND = 0xa9, WINED3D_SM5_OP_ATOMIC_OR = 0xaa, WINED3D_SM5_OP_ATOMIC_XOR = 0xab, WINED3D_SM5_OP_ATOMIC_IADD = 0xad, @@ -899,6 +900,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_STORE_RAW, WINED3DSIH_STORE_RAW, "U", "iu"}, {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "u", "iiR"}, {WINED3D_SM5_OP_STORE_STRUCTURED, WINED3DSIH_STORE_STRUCTURED, "U", "iiu"}, + {WINED3D_SM5_OP_ATOMIC_AND, WINED3DSIH_ATOMIC_AND, "U", "iu"}, {WINED3D_SM5_OP_ATOMIC_OR, WINED3DSIH_ATOMIC_OR, "U", "iu"}, {WINED3D_SM5_OP_ATOMIC_XOR, WINED3DSIH_ATOMIC_XOR, "U", "iu"}, {WINED3D_SM5_OP_ATOMIC_IADD, WINED3DSIH_ATOMIC_IADD, "U", "ii"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d38a64e..6804103 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -569,6 +569,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_ABS, WINED3DSIH_ADD, WINED3DSIH_AND, + WINED3DSIH_ATOMIC_AND, WINED3DSIH_ATOMIC_IADD, WINED3DSIH_ATOMIC_OR, WINED3DSIH_ATOMIC_XOR,