[PATCH 17/18] wined3d: Recognize SM5 atomic_imax opcode.
Józef Kucia
jkucia at codeweavers.com
Fri Dec 9 04:30:52 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 54abcb8..cab03b9 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5205,6 +5205,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_ATOMIC_AND */ NULL,
/* WINED3DSIH_ATOMIC_CMP_STORE */ NULL,
/* WINED3DSIH_ATOMIC_IADD */ NULL,
+ /* WINED3DSIH_ATOMIC_IMAX */ NULL,
/* WINED3DSIH_ATOMIC_OR */ NULL,
/* WINED3DSIH_ATOMIC_UMAX */ NULL,
/* WINED3DSIH_ATOMIC_UMIN */ NULL,
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index d1c0a95..1f9f5dd 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -8929,6 +8929,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_ATOMIC_AND */ NULL,
/* WINED3DSIH_ATOMIC_CMP_STORE */ NULL,
/* WINED3DSIH_ATOMIC_IADD */ shader_glsl_atomic,
+ /* WINED3DSIH_ATOMIC_IMAX */ NULL,
/* WINED3DSIH_ATOMIC_OR */ NULL,
/* WINED3DSIH_ATOMIC_UMAX */ NULL,
/* WINED3DSIH_ATOMIC_UMIN */ NULL,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index feaa6b9..3c11fea 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -46,6 +46,7 @@ static const char * const shader_opcode_names[] =
/* WINED3DSIH_ATOMIC_AND */ "atomic_and",
/* WINED3DSIH_ATOMIC_CMP_STORE */ "atomic_cmp_store",
/* WINED3DSIH_ATOMIC_IADD */ "atomic_iadd",
+ /* WINED3DSIH_ATOMIC_IMAX */ "atomic_imax",
/* WINED3DSIH_ATOMIC_OR */ "atomic_or",
/* WINED3DSIH_ATOMIC_UMAX */ "atomic_umax",
/* WINED3DSIH_ATOMIC_UMIN */ "atomic_umin",
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index aa6aead..1fffbc7 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -264,6 +264,7 @@ enum wined3d_sm4_opcode
WINED3D_SM5_OP_ATOMIC_XOR = 0xab,
WINED3D_SM5_OP_ATOMIC_CMP_STORE = 0xac,
WINED3D_SM5_OP_ATOMIC_IADD = 0xad,
+ WINED3D_SM5_OP_ATOMIC_IMAX = 0xae,
WINED3D_SM5_OP_ATOMIC_UMAX = 0xb0,
WINED3D_SM5_OP_ATOMIC_UMIN = 0xb1,
WINED3D_SM5_OP_IMM_ATOMIC_ALLOC = 0xb2,
@@ -970,6 +971,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
{WINED3D_SM5_OP_ATOMIC_XOR, WINED3DSIH_ATOMIC_XOR, "U", "iu"},
{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_IMAX, WINED3DSIH_ATOMIC_IMAX, "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"},
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index d632d42..6597300 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -577,6 +577,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_ATOMIC_AND,
WINED3DSIH_ATOMIC_CMP_STORE,
WINED3DSIH_ATOMIC_IADD,
+ WINED3DSIH_ATOMIC_IMAX,
WINED3DSIH_ATOMIC_OR,
WINED3DSIH_ATOMIC_UMAX,
WINED3DSIH_ATOMIC_UMIN,
--
2.7.3
More information about the wine-patches
mailing list