=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Recognize SM5 imm_atomic_imin opcode.
Alexandre Julliard
julliard at winehq.org
Thu Feb 16 15:12:29 CST 2017
Module: wine
Branch: master
Commit: d0e7ffa0e4110301527442ced5af06240bccbda9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e7ffa0e4110301527442ced5af06240bccbda9
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Thu Feb 16 13:02:20 2017 +0100
wined3d: Recognize SM5 imm_atomic_imin 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 3e32cab..24dcb05 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5144,6 +5144,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL,
/* WINED3DSIH_IMM_ATOMIC_IADD */ NULL,
/* WINED3DSIH_IMM_ATOMIC_IMAX */ NULL,
+ /* WINED3DSIH_IMM_ATOMIC_IMIN */ NULL,
/* WINED3DSIH_IMM_ATOMIC_OR */ NULL,
/* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL,
/* WINED3DSIH_IMM_ATOMIC_UMIN */ NULL,
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index ff24a92..adc6746 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -9345,6 +9345,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_IMM_ATOMIC_EXCH */ shader_glsl_atomic,
/* WINED3DSIH_IMM_ATOMIC_IADD */ shader_glsl_atomic,
/* WINED3DSIH_IMM_ATOMIC_IMAX */ NULL,
+ /* WINED3DSIH_IMM_ATOMIC_IMIN */ NULL,
/* WINED3DSIH_IMM_ATOMIC_OR */ shader_glsl_atomic,
/* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL,
/* WINED3DSIH_IMM_ATOMIC_UMIN */ NULL,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 0a07253..6f012cd 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -164,6 +164,7 @@ static const char * const shader_opcode_names[] =
/* WINED3DSIH_IMM_ATOMIC_EXCH */ "imm_atomic_exch",
/* WINED3DSIH_IMM_ATOMIC_IADD */ "imm_atomic_iadd",
/* WINED3DSIH_IMM_ATOMIC_IMAX */ "imm_atomic_imax",
+ /* WINED3DSIH_IMM_ATOMIC_IMIN */ "imm_atomic_imin",
/* WINED3DSIH_IMM_ATOMIC_OR */ "imm_atomic_or",
/* WINED3DSIH_IMM_ATOMIC_UMAX */ "imm_atomic_umax",
/* WINED3DSIH_IMM_ATOMIC_UMIN */ "imm_atomic_umin",
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index 44a9da9..61af803 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -284,6 +284,7 @@ enum wined3d_sm4_opcode
WINED3D_SM5_OP_IMM_ATOMIC_EXCH = 0xb8,
WINED3D_SM5_OP_IMM_ATOMIC_CMP_EXCH = 0xb9,
WINED3D_SM5_OP_IMM_ATOMIC_IMAX = 0xba,
+ WINED3D_SM5_OP_IMM_ATOMIC_IMIN = 0xbb,
WINED3D_SM5_OP_IMM_ATOMIC_UMAX = 0xbc,
WINED3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd,
WINED3D_SM5_OP_SYNC = 0xbe,
@@ -1011,6 +1012,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
{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_IMAX, WINED3DSIH_IMM_ATOMIC_IMAX, "iU", "ii"},
+ {WINED3D_SM5_OP_IMM_ATOMIC_IMIN, WINED3DSIH_IMM_ATOMIC_IMIN, "iU", "ii"},
{WINED3D_SM5_OP_IMM_ATOMIC_UMAX, WINED3DSIH_IMM_ATOMIC_UMAX, "uU", "iu"},
{WINED3D_SM5_OP_IMM_ATOMIC_UMIN, WINED3DSIH_IMM_ATOMIC_UMIN, "uU", "iu"},
{WINED3D_SM5_OP_SYNC, WINED3DSIH_SYNC, "", "",
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 9d63983..54adf26 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -695,6 +695,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_IMM_ATOMIC_EXCH,
WINED3DSIH_IMM_ATOMIC_IADD,
WINED3DSIH_IMM_ATOMIC_IMAX,
+ WINED3DSIH_IMM_ATOMIC_IMIN,
WINED3DSIH_IMM_ATOMIC_OR,
WINED3DSIH_IMM_ATOMIC_UMAX,
WINED3DSIH_IMM_ATOMIC_UMIN,
More information about the wine-cvs
mailing list