Commit 3dbd5d0f authored by Józef Kucia's avatar Józef Kucia Committed by Alexandre Julliard

wined3d: Recognize SM5 atomic_or opcode.

parent bde5cc79
...@@ -5203,6 +5203,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL ...@@ -5203,6 +5203,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_ADD */ shader_hw_map2gl, /* WINED3DSIH_ADD */ shader_hw_map2gl,
/* WINED3DSIH_AND */ NULL, /* WINED3DSIH_AND */ NULL,
/* WINED3DSIH_ATOMIC_IADD */ NULL, /* WINED3DSIH_ATOMIC_IADD */ NULL,
/* WINED3DSIH_ATOMIC_OR */ NULL,
/* WINED3DSIH_ATOMIC_XOR */ NULL, /* WINED3DSIH_ATOMIC_XOR */ NULL,
/* WINED3DSIH_BEM */ pshader_hw_bem, /* WINED3DSIH_BEM */ pshader_hw_bem,
/* WINED3DSIH_BFI */ NULL, /* WINED3DSIH_BFI */ NULL,
......
...@@ -8866,6 +8866,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB ...@@ -8866,6 +8866,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_ADD */ shader_glsl_binop, /* WINED3DSIH_ADD */ shader_glsl_binop,
/* WINED3DSIH_AND */ shader_glsl_binop, /* WINED3DSIH_AND */ shader_glsl_binop,
/* WINED3DSIH_ATOMIC_IADD */ shader_glsl_atomic, /* WINED3DSIH_ATOMIC_IADD */ shader_glsl_atomic,
/* WINED3DSIH_ATOMIC_OR */ NULL,
/* WINED3DSIH_ATOMIC_XOR */ NULL, /* WINED3DSIH_ATOMIC_XOR */ NULL,
/* WINED3DSIH_BEM */ shader_glsl_bem, /* WINED3DSIH_BEM */ shader_glsl_bem,
/* WINED3DSIH_BFI */ NULL, /* WINED3DSIH_BFI */ NULL,
......
...@@ -44,6 +44,7 @@ static const char * const shader_opcode_names[] = ...@@ -44,6 +44,7 @@ static const char * const shader_opcode_names[] =
/* WINED3DSIH_ADD */ "add", /* WINED3DSIH_ADD */ "add",
/* WINED3DSIH_AND */ "and", /* WINED3DSIH_AND */ "and",
/* WINED3DSIH_ATOMIC_IADD */ "atomic_iadd", /* WINED3DSIH_ATOMIC_IADD */ "atomic_iadd",
/* WINED3DSIH_ATOMIC_OR */ "atomic_or",
/* WINED3DSIH_ATOMIC_XOR */ "atomic_xor", /* WINED3DSIH_ATOMIC_XOR */ "atomic_xor",
/* WINED3DSIH_BEM */ "bem", /* WINED3DSIH_BEM */ "bem",
/* WINED3DSIH_BFI */ "bfi", /* WINED3DSIH_BFI */ "bfi",
......
...@@ -251,6 +251,7 @@ enum wined3d_sm4_opcode ...@@ -251,6 +251,7 @@ enum wined3d_sm4_opcode
WINED3D_SM5_OP_STORE_RAW = 0xa6, WINED3D_SM5_OP_STORE_RAW = 0xa6,
WINED3D_SM5_OP_LD_STRUCTURED = 0xa7, WINED3D_SM5_OP_LD_STRUCTURED = 0xa7,
WINED3D_SM5_OP_STORE_STRUCTURED = 0xa8, WINED3D_SM5_OP_STORE_STRUCTURED = 0xa8,
WINED3D_SM5_OP_ATOMIC_OR = 0xaa,
WINED3D_SM5_OP_ATOMIC_XOR = 0xab, WINED3D_SM5_OP_ATOMIC_XOR = 0xab,
WINED3D_SM5_OP_ATOMIC_IADD = 0xad, WINED3D_SM5_OP_ATOMIC_IADD = 0xad,
WINED3D_SM5_OP_IMM_ATOMIC_ALLOC = 0xb2, WINED3D_SM5_OP_IMM_ATOMIC_ALLOC = 0xb2,
...@@ -898,6 +899,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = ...@@ -898,6 +899,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
{WINED3D_SM5_OP_STORE_RAW, WINED3DSIH_STORE_RAW, "U", "iu"}, {WINED3D_SM5_OP_STORE_RAW, WINED3DSIH_STORE_RAW, "U", "iu"},
{WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "u", "iiR"}, {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "u", "iiR"},
{WINED3D_SM5_OP_STORE_STRUCTURED, WINED3DSIH_STORE_STRUCTURED, "U", "iiu"}, {WINED3D_SM5_OP_STORE_STRUCTURED, WINED3DSIH_STORE_STRUCTURED, "U", "iiu"},
{WINED3D_SM5_OP_ATOMIC_OR, WINED3DSIH_ATOMIC_OR, "U", "iu"},
{WINED3D_SM5_OP_ATOMIC_XOR, WINED3DSIH_ATOMIC_XOR, "U", "iu"}, {WINED3D_SM5_OP_ATOMIC_XOR, WINED3DSIH_ATOMIC_XOR, "U", "iu"},
{WINED3D_SM5_OP_ATOMIC_IADD, WINED3DSIH_ATOMIC_IADD, "U", "ii"}, {WINED3D_SM5_OP_ATOMIC_IADD, WINED3DSIH_ATOMIC_IADD, "U", "ii"},
{WINED3D_SM5_OP_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_ALLOC, "u", "U"}, {WINED3D_SM5_OP_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_ALLOC, "u", "U"},
......
...@@ -570,6 +570,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER ...@@ -570,6 +570,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_ADD, WINED3DSIH_ADD,
WINED3DSIH_AND, WINED3DSIH_AND,
WINED3DSIH_ATOMIC_IADD, WINED3DSIH_ATOMIC_IADD,
WINED3DSIH_ATOMIC_OR,
WINED3DSIH_ATOMIC_XOR, WINED3DSIH_ATOMIC_XOR,
WINED3DSIH_BEM, WINED3DSIH_BEM,
WINED3DSIH_BFI, WINED3DSIH_BFI,
......
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