Commit 0bbbe4c5 authored by Józef Kucia's avatar Józef Kucia Committed by Alexandre Julliard

wined3d: Recognize SM5 imm_atomic_umax opcode.

parent 7d951397
...@@ -5309,6 +5309,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL ...@@ -5309,6 +5309,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL,
/* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL, /* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL,
/* WINED3DSIH_IMM_ATOMIC_OR */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ NULL,
/* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL,
/* WINED3DSIH_IMM_ATOMIC_XOR */ NULL, /* WINED3DSIH_IMM_ATOMIC_XOR */ NULL,
/* WINED3DSIH_IMUL */ NULL, /* WINED3DSIH_IMUL */ NULL,
/* WINED3DSIH_INE */ NULL, /* WINED3DSIH_INE */ NULL,
......
...@@ -8972,6 +8972,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB ...@@ -8972,6 +8972,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL,
/* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL, /* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL,
/* WINED3DSIH_IMM_ATOMIC_OR */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ NULL,
/* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL,
/* WINED3DSIH_IMM_ATOMIC_XOR */ NULL, /* WINED3DSIH_IMM_ATOMIC_XOR */ NULL,
/* WINED3DSIH_IMUL */ shader_glsl_imul, /* WINED3DSIH_IMUL */ shader_glsl_imul,
/* WINED3DSIH_INE */ shader_glsl_relop, /* WINED3DSIH_INE */ shader_glsl_relop,
......
...@@ -150,6 +150,7 @@ static const char * const shader_opcode_names[] = ...@@ -150,6 +150,7 @@ static const char * const shader_opcode_names[] =
/* WINED3DSIH_IMM_ATOMIC_CONSUME */ "imm_atomic_consume", /* WINED3DSIH_IMM_ATOMIC_CONSUME */ "imm_atomic_consume",
/* WINED3DSIH_IMM_ATOMIC_EXCH */ "imm_atomic_exch", /* WINED3DSIH_IMM_ATOMIC_EXCH */ "imm_atomic_exch",
/* WINED3DSIH_IMM_ATOMIC_OR */ "imm_atomic_or", /* WINED3DSIH_IMM_ATOMIC_OR */ "imm_atomic_or",
/* WINED3DSIH_IMM_ATOMIC_UMAX */ "imm_atomic_umax",
/* WINED3DSIH_IMM_ATOMIC_XOR */ "imm_atomic_xor", /* WINED3DSIH_IMM_ATOMIC_XOR */ "imm_atomic_xor",
/* WINED3DSIH_IMUL */ "imul", /* WINED3DSIH_IMUL */ "imul",
/* WINED3DSIH_INE */ "ine", /* WINED3DSIH_INE */ "ine",
......
...@@ -265,6 +265,7 @@ enum wined3d_sm4_opcode ...@@ -265,6 +265,7 @@ enum wined3d_sm4_opcode
WINED3D_SM5_OP_IMM_ATOMIC_XOR = 0xb7, WINED3D_SM5_OP_IMM_ATOMIC_XOR = 0xb7,
WINED3D_SM5_OP_IMM_ATOMIC_EXCH = 0xb8, WINED3D_SM5_OP_IMM_ATOMIC_EXCH = 0xb8,
WINED3D_SM5_OP_IMM_ATOMIC_CMP_EXCH = 0xb9, WINED3D_SM5_OP_IMM_ATOMIC_CMP_EXCH = 0xb9,
WINED3D_SM5_OP_IMM_ATOMIC_UMAX = 0xbc,
WINED3D_SM5_OP_SYNC = 0xbe, WINED3D_SM5_OP_SYNC = 0xbe,
}; };
...@@ -921,6 +922,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = ...@@ -921,6 +922,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
{WINED3D_SM5_OP_IMM_ATOMIC_XOR, WINED3DSIH_IMM_ATOMIC_XOR, "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_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_CMP_EXCH, WINED3DSIH_IMM_ATOMIC_CMP_EXCH, "uU", "iuu"},
{WINED3D_SM5_OP_IMM_ATOMIC_UMAX, WINED3DSIH_IMM_ATOMIC_UMAX, "uU", "iu"},
{WINED3D_SM5_OP_SYNC, WINED3DSIH_SYNC, "", "", {WINED3D_SM5_OP_SYNC, WINED3DSIH_SYNC, "", "",
shader_sm5_read_sync}, shader_sm5_read_sync},
}; };
......
...@@ -676,6 +676,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER ...@@ -676,6 +676,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_CONSUME,
WINED3DSIH_IMM_ATOMIC_EXCH, WINED3DSIH_IMM_ATOMIC_EXCH,
WINED3DSIH_IMM_ATOMIC_OR, WINED3DSIH_IMM_ATOMIC_OR,
WINED3DSIH_IMM_ATOMIC_UMAX,
WINED3DSIH_IMM_ATOMIC_XOR, WINED3DSIH_IMM_ATOMIC_XOR,
WINED3DSIH_IMUL, WINED3DSIH_IMUL,
WINED3DSIH_INE, WINED3DSIH_INE,
......
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