Commit 5e4e2a15 authored by Józef Kucia's avatar Józef Kucia Committed by Alexandre Julliard

wined3d: Recognize SM5 atomic_imin opcode.

parent 5763e7f9
...@@ -5206,6 +5206,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL ...@@ -5206,6 +5206,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_ATOMIC_CMP_STORE */ NULL, /* WINED3DSIH_ATOMIC_CMP_STORE */ NULL,
/* WINED3DSIH_ATOMIC_IADD */ NULL, /* WINED3DSIH_ATOMIC_IADD */ NULL,
/* WINED3DSIH_ATOMIC_IMAX */ NULL, /* WINED3DSIH_ATOMIC_IMAX */ NULL,
/* WINED3DSIH_ATOMIC_IMIN */ NULL,
/* WINED3DSIH_ATOMIC_OR */ NULL, /* WINED3DSIH_ATOMIC_OR */ NULL,
/* WINED3DSIH_ATOMIC_UMAX */ NULL, /* WINED3DSIH_ATOMIC_UMAX */ NULL,
/* WINED3DSIH_ATOMIC_UMIN */ NULL, /* WINED3DSIH_ATOMIC_UMIN */ NULL,
......
...@@ -8930,6 +8930,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB ...@@ -8930,6 +8930,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_ATOMIC_CMP_STORE */ NULL, /* WINED3DSIH_ATOMIC_CMP_STORE */ NULL,
/* WINED3DSIH_ATOMIC_IADD */ shader_glsl_atomic, /* WINED3DSIH_ATOMIC_IADD */ shader_glsl_atomic,
/* WINED3DSIH_ATOMIC_IMAX */ NULL, /* WINED3DSIH_ATOMIC_IMAX */ NULL,
/* WINED3DSIH_ATOMIC_IMIN */ NULL,
/* WINED3DSIH_ATOMIC_OR */ NULL, /* WINED3DSIH_ATOMIC_OR */ NULL,
/* WINED3DSIH_ATOMIC_UMAX */ NULL, /* WINED3DSIH_ATOMIC_UMAX */ NULL,
/* WINED3DSIH_ATOMIC_UMIN */ NULL, /* WINED3DSIH_ATOMIC_UMIN */ NULL,
......
...@@ -47,6 +47,7 @@ static const char * const shader_opcode_names[] = ...@@ -47,6 +47,7 @@ static const char * const shader_opcode_names[] =
/* WINED3DSIH_ATOMIC_CMP_STORE */ "atomic_cmp_store", /* WINED3DSIH_ATOMIC_CMP_STORE */ "atomic_cmp_store",
/* WINED3DSIH_ATOMIC_IADD */ "atomic_iadd", /* WINED3DSIH_ATOMIC_IADD */ "atomic_iadd",
/* WINED3DSIH_ATOMIC_IMAX */ "atomic_imax", /* WINED3DSIH_ATOMIC_IMAX */ "atomic_imax",
/* WINED3DSIH_ATOMIC_IMIN */ "atomic_imin",
/* WINED3DSIH_ATOMIC_OR */ "atomic_or", /* WINED3DSIH_ATOMIC_OR */ "atomic_or",
/* WINED3DSIH_ATOMIC_UMAX */ "atomic_umax", /* WINED3DSIH_ATOMIC_UMAX */ "atomic_umax",
/* WINED3DSIH_ATOMIC_UMIN */ "atomic_umin", /* WINED3DSIH_ATOMIC_UMIN */ "atomic_umin",
......
...@@ -265,6 +265,7 @@ enum wined3d_sm4_opcode ...@@ -265,6 +265,7 @@ enum wined3d_sm4_opcode
WINED3D_SM5_OP_ATOMIC_CMP_STORE = 0xac, WINED3D_SM5_OP_ATOMIC_CMP_STORE = 0xac,
WINED3D_SM5_OP_ATOMIC_IADD = 0xad, WINED3D_SM5_OP_ATOMIC_IADD = 0xad,
WINED3D_SM5_OP_ATOMIC_IMAX = 0xae, WINED3D_SM5_OP_ATOMIC_IMAX = 0xae,
WINED3D_SM5_OP_ATOMIC_IMIN = 0xaf,
WINED3D_SM5_OP_ATOMIC_UMAX = 0xb0, WINED3D_SM5_OP_ATOMIC_UMAX = 0xb0,
WINED3D_SM5_OP_ATOMIC_UMIN = 0xb1, WINED3D_SM5_OP_ATOMIC_UMIN = 0xb1,
WINED3D_SM5_OP_IMM_ATOMIC_ALLOC = 0xb2, WINED3D_SM5_OP_IMM_ATOMIC_ALLOC = 0xb2,
...@@ -972,6 +973,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = ...@@ -972,6 +973,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
{WINED3D_SM5_OP_ATOMIC_CMP_STORE, WINED3DSIH_ATOMIC_CMP_STORE, "U", "iuu"}, {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_IADD, WINED3DSIH_ATOMIC_IADD, "U", "ii"},
{WINED3D_SM5_OP_ATOMIC_IMAX, WINED3DSIH_ATOMIC_IMAX, "U", "ii"}, {WINED3D_SM5_OP_ATOMIC_IMAX, WINED3DSIH_ATOMIC_IMAX, "U", "ii"},
{WINED3D_SM5_OP_ATOMIC_IMIN, WINED3DSIH_ATOMIC_IMIN, "U", "ii"},
{WINED3D_SM5_OP_ATOMIC_UMAX, WINED3DSIH_ATOMIC_UMAX, "U", "iu"}, {WINED3D_SM5_OP_ATOMIC_UMAX, WINED3DSIH_ATOMIC_UMAX, "U", "iu"},
{WINED3D_SM5_OP_ATOMIC_UMIN, WINED3DSIH_ATOMIC_UMIN, "U", "iu"}, {WINED3D_SM5_OP_ATOMIC_UMIN, WINED3DSIH_ATOMIC_UMIN, "U", "iu"},
{WINED3D_SM5_OP_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_ALLOC, "u", "U"}, {WINED3D_SM5_OP_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_ALLOC, "u", "U"},
......
...@@ -578,6 +578,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER ...@@ -578,6 +578,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_ATOMIC_CMP_STORE, WINED3DSIH_ATOMIC_CMP_STORE,
WINED3DSIH_ATOMIC_IADD, WINED3DSIH_ATOMIC_IADD,
WINED3DSIH_ATOMIC_IMAX, WINED3DSIH_ATOMIC_IMAX,
WINED3DSIH_ATOMIC_IMIN,
WINED3DSIH_ATOMIC_OR, WINED3DSIH_ATOMIC_OR,
WINED3DSIH_ATOMIC_UMAX, WINED3DSIH_ATOMIC_UMAX,
WINED3DSIH_ATOMIC_UMIN, WINED3DSIH_ATOMIC_UMIN,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment