Commit 17b599a4 authored by Józef Kucia's avatar Józef Kucia Committed by Alexandre Julliard

wined3d: Recognize SM5 store_structured opcode.

parent 8d14307f
...@@ -5352,6 +5352,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL ...@@ -5352,6 +5352,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_SLT */ shader_hw_map2gl, /* WINED3DSIH_SLT */ shader_hw_map2gl,
/* WINED3DSIH_SQRT */ NULL, /* WINED3DSIH_SQRT */ NULL,
/* WINED3DSIH_STORE_RAW */ NULL, /* WINED3DSIH_STORE_RAW */ NULL,
/* WINED3DSIH_STORE_STRUCTURED */ NULL,
/* WINED3DSIH_STORE_UAV_TYPED */ NULL, /* WINED3DSIH_STORE_UAV_TYPED */ NULL,
/* WINED3DSIH_SUB */ shader_hw_map2gl, /* WINED3DSIH_SUB */ shader_hw_map2gl,
/* WINED3DSIH_SWITCH */ NULL, /* WINED3DSIH_SWITCH */ NULL,
......
...@@ -8686,6 +8686,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB ...@@ -8686,6 +8686,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_SLT */ shader_glsl_compare, /* WINED3DSIH_SLT */ shader_glsl_compare,
/* WINED3DSIH_SQRT */ shader_glsl_map2gl, /* WINED3DSIH_SQRT */ shader_glsl_map2gl,
/* WINED3DSIH_STORE_RAW */ NULL, /* WINED3DSIH_STORE_RAW */ NULL,
/* WINED3DSIH_STORE_STRUCTURED */ NULL,
/* WINED3DSIH_STORE_UAV_TYPED */ NULL, /* WINED3DSIH_STORE_UAV_TYPED */ NULL,
/* WINED3DSIH_SUB */ shader_glsl_binop, /* WINED3DSIH_SUB */ shader_glsl_binop,
/* WINED3DSIH_SWITCH */ shader_glsl_switch, /* WINED3DSIH_SWITCH */ shader_glsl_switch,
......
...@@ -184,6 +184,7 @@ static const char * const shader_opcode_names[] = ...@@ -184,6 +184,7 @@ static const char * const shader_opcode_names[] =
/* WINED3DSIH_SLT */ "slt", /* WINED3DSIH_SLT */ "slt",
/* WINED3DSIH_SQRT */ "sqrt", /* WINED3DSIH_SQRT */ "sqrt",
/* WINED3DSIH_STORE_RAW */ "store_raw", /* WINED3DSIH_STORE_RAW */ "store_raw",
/* WINED3DSIH_STORE_STRUCTURED */ "store_structured",
/* WINED3DSIH_STORE_UAV_TYPED */ "store_uav_typed", /* WINED3DSIH_STORE_UAV_TYPED */ "store_uav_typed",
/* WINED3DSIH_SUB */ "sub", /* WINED3DSIH_SUB */ "sub",
/* WINED3DSIH_SWITCH */ "switch", /* WINED3DSIH_SWITCH */ "switch",
......
...@@ -224,6 +224,7 @@ enum wined3d_sm4_opcode ...@@ -224,6 +224,7 @@ enum wined3d_sm4_opcode
WINED3D_SM5_OP_LD_RAW = 0xa5, WINED3D_SM5_OP_LD_RAW = 0xa5,
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_IMM_ATOMIC_CONSUME = 0xb3, WINED3D_SM5_OP_IMM_ATOMIC_CONSUME = 0xb3,
}; };
...@@ -773,6 +774,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = ...@@ -773,6 +774,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
{WINED3D_SM5_OP_LD_RAW, WINED3DSIH_LD_RAW, "u", "iU"}, {WINED3D_SM5_OP_LD_RAW, WINED3DSIH_LD_RAW, "u", "iU"},
{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", "uuR"}, {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "u", "uuR"},
{WINED3D_SM5_OP_STORE_STRUCTURED, WINED3DSIH_STORE_STRUCTURED, "U", "iiu"},
{WINED3D_SM5_OP_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_CONSUME, "u", "U"}, {WINED3D_SM5_OP_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_CONSUME, "u", "U"},
}; };
......
...@@ -692,6 +692,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER ...@@ -692,6 +692,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_SLT, WINED3DSIH_SLT,
WINED3DSIH_SQRT, WINED3DSIH_SQRT,
WINED3DSIH_STORE_RAW, WINED3DSIH_STORE_RAW,
WINED3DSIH_STORE_STRUCTURED,
WINED3DSIH_STORE_UAV_TYPED, WINED3DSIH_STORE_UAV_TYPED,
WINED3DSIH_SUB, WINED3DSIH_SUB,
WINED3DSIH_SWITCH, WINED3DSIH_SWITCH,
......
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