[PATCH 12/18] wined3d: Recognize SM5 imm_atomic_cmp_exch opcode.
Józef Kucia
jkucia at codeweavers.com
Mon Dec 5 05:04:35 CST 2016
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
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 3ceff11..16d5f17 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_AND */ NULL,
+ /* WINED3DSIH_IMM_ATOMIC_CMP_EXCH */ NULL,
/* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL,
/* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL,
/* WINED3DSIH_IMM_ATOMIC_OR */ NULL,
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index de23acb..c052e15 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_AND */ NULL,
+ /* WINED3DSIH_IMM_ATOMIC_CMP_EXCH */ NULL,
/* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL,
/* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL,
/* WINED3DSIH_IMM_ATOMIC_OR */ NULL,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 8105e26..4aa9c74 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_AND */ "imm_atomic_and",
+ /* WINED3DSIH_IMM_ATOMIC_CMP_EXCH */ "imm_atomic_cmp_exch",
/* WINED3DSIH_IMM_ATOMIC_CONSUME */ "imm_atomic_consume",
/* WINED3DSIH_IMM_ATOMIC_EXCH */ "imm_atomic_exch",
/* WINED3DSIH_IMM_ATOMIC_OR */ "imm_atomic_or",
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index 9b85b46..edb4ae5 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -261,6 +261,7 @@ enum wined3d_sm4_opcode
WINED3D_SM5_OP_IMM_ATOMIC_OR = 0xb6,
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_SYNC = 0xbe,
};
@@ -913,6 +914,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
{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_IMM_ATOMIC_CMP_EXCH, WINED3DSIH_IMM_ATOMIC_CMP_EXCH, "uU", "iuu"},
{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 c67ea19..4c23777 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_AND,
+ WINED3DSIH_IMM_ATOMIC_CMP_EXCH,
WINED3DSIH_IMM_ATOMIC_CONSUME,
WINED3DSIH_IMM_ATOMIC_EXCH,
WINED3DSIH_IMM_ATOMIC_OR,
--
2.7.3
More information about the wine-patches
mailing list