=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Recognize SM5 imm_atomic_or opcode.
Alexandre Julliard
julliard at winehq.org
Tue Dec 6 16:27:44 CST 2016
Module: wine
Branch: master
Commit: 1cc5d9168c56492b5c9410020bb404d84c6f7ad9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc5d9168c56492b5c9410020bb404d84c6f7ad9
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Mon Dec 5 12:04:31 2016 +0100
wined3d: Recognize SM5 imm_atomic_or 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 e58425a..d89fdf3 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5302,6 +5302,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_OR */ 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 455756c..672d6dd 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -8965,6 +8965,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_OR */ 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 ae996c0..0f89513 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -143,6 +143,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_OR */ "imm_atomic_or",
/* 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 b056118..9a36e83 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_IADD = 0xad,
WINED3D_SM5_OP_IMM_ATOMIC_ALLOC = 0xb2,
WINED3D_SM5_OP_IMM_ATOMIC_CONSUME = 0xb3,
+ WINED3D_SM5_OP_IMM_ATOMIC_OR = 0xb6,
WINED3D_SM5_OP_IMM_ATOMIC_XOR = 0xb7,
WINED3D_SM5_OP_SYNC = 0xbe,
};
@@ -906,6 +907,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_OR, WINED3DSIH_IMM_ATOMIC_OR, "uU", "iu"},
{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 6804103..b63569f 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -669,6 +669,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_IMIN,
WINED3DSIH_IMM_ATOMIC_ALLOC,
WINED3DSIH_IMM_ATOMIC_CONSUME,
+ WINED3DSIH_IMM_ATOMIC_OR,
WINED3DSIH_IMM_ATOMIC_XOR,
WINED3DSIH_IMUL,
WINED3DSIH_INE,
More information about the wine-cvs
mailing list