=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Recognize SM5 imm_atomic_umax opcode.
Alexandre Julliard
julliard at winehq.org
Tue Dec 6 16:27:45 CST 2016
Module: wine
Branch: master
Commit: 0bbbe4c53e25ec6552dc25b5b7dc89345a68c3b4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bbbe4c53e25ec6552dc25b5b7dc89345a68c3b4
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Mon Dec 5 12:04:39 2016 +0100
wined3d: Recognize SM5 imm_atomic_umax opcode.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at 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 3976c19..508f927 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5309,6 +5309,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL,
/* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL,
/* WINED3DSIH_IMM_ATOMIC_OR */ NULL,
+ /* WINED3DSIH_IMM_ATOMIC_UMAX */ 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 b446659..45c53b6 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -8972,6 +8972,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL,
/* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL,
/* WINED3DSIH_IMM_ATOMIC_OR */ NULL,
+ /* WINED3DSIH_IMM_ATOMIC_UMAX */ 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 e070d69..bb2a213 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -150,6 +150,7 @@ static const char * const shader_opcode_names[] =
/* WINED3DSIH_IMM_ATOMIC_CONSUME */ "imm_atomic_consume",
/* WINED3DSIH_IMM_ATOMIC_EXCH */ "imm_atomic_exch",
/* WINED3DSIH_IMM_ATOMIC_OR */ "imm_atomic_or",
+ /* WINED3DSIH_IMM_ATOMIC_UMAX */ "imm_atomic_umax",
/* 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 6d8a0db..11b17a6 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -265,6 +265,7 @@ enum wined3d_sm4_opcode
WINED3D_SM5_OP_IMM_ATOMIC_XOR = 0xb7,
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_SYNC = 0xbe,
};
@@ -921,6 +922,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
{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_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_SYNC, WINED3DSIH_SYNC, "", "",
shader_sm5_read_sync},
};
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 4610a7c..3ece139 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -676,6 +676,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_IMM_ATOMIC_CONSUME,
WINED3DSIH_IMM_ATOMIC_EXCH,
WINED3DSIH_IMM_ATOMIC_OR,
+ WINED3DSIH_IMM_ATOMIC_UMAX,
WINED3DSIH_IMM_ATOMIC_XOR,
WINED3DSIH_IMUL,
WINED3DSIH_INE,
More information about the wine-cvs
mailing list