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

wined3d: Recognize SM5 ld_raw opcode.

parent 41b296ee
...@@ -5301,6 +5301,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL ...@@ -5301,6 +5301,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_LABEL */ shader_hw_label, /* WINED3DSIH_LABEL */ shader_hw_label,
/* WINED3DSIH_LD */ NULL, /* WINED3DSIH_LD */ NULL,
/* WINED3DSIH_LD2DMS */ NULL, /* WINED3DSIH_LD2DMS */ NULL,
/* WINED3DSIH_LD_RAW */ NULL,
/* WINED3DSIH_LD_STRUCTURED */ NULL, /* WINED3DSIH_LD_STRUCTURED */ NULL,
/* WINED3DSIH_LIT */ shader_hw_map2gl, /* WINED3DSIH_LIT */ shader_hw_map2gl,
/* WINED3DSIH_LOG */ shader_hw_scalar_op, /* WINED3DSIH_LOG */ shader_hw_scalar_op,
......
...@@ -8635,6 +8635,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB ...@@ -8635,6 +8635,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LABEL */ shader_glsl_label,
/* WINED3DSIH_LD */ shader_glsl_ld, /* WINED3DSIH_LD */ shader_glsl_ld,
/* WINED3DSIH_LD2DMS */ NULL, /* WINED3DSIH_LD2DMS */ NULL,
/* WINED3DSIH_LD_RAW */ NULL,
/* WINED3DSIH_LD_STRUCTURED */ NULL, /* WINED3DSIH_LD_STRUCTURED */ NULL,
/* WINED3DSIH_LIT */ shader_glsl_lit, /* WINED3DSIH_LIT */ shader_glsl_lit,
/* WINED3DSIH_LOG */ shader_glsl_scalar_op, /* WINED3DSIH_LOG */ shader_glsl_scalar_op,
......
...@@ -133,6 +133,7 @@ static const char * const shader_opcode_names[] = ...@@ -133,6 +133,7 @@ static const char * const shader_opcode_names[] =
/* WINED3DSIH_LABEL */ "label", /* WINED3DSIH_LABEL */ "label",
/* WINED3DSIH_LD */ "ld", /* WINED3DSIH_LD */ "ld",
/* WINED3DSIH_LD2DMS */ "ld2dms", /* WINED3DSIH_LD2DMS */ "ld2dms",
/* WINED3DSIH_LD_RAW */ "ld_raw",
/* WINED3DSIH_LD_STRUCTURED */ "ld_structured", /* WINED3DSIH_LD_STRUCTURED */ "ld_structured",
/* WINED3DSIH_LIT */ "lit", /* WINED3DSIH_LIT */ "lit",
/* WINED3DSIH_LOG */ "log", /* WINED3DSIH_LOG */ "log",
......
...@@ -220,6 +220,7 @@ enum wined3d_sm4_opcode ...@@ -220,6 +220,7 @@ enum wined3d_sm4_opcode
WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c,
WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2,
WINED3D_SM5_OP_STORE_UAV_TYPED = 0xa4, WINED3D_SM5_OP_STORE_UAV_TYPED = 0xa4,
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,
}; };
...@@ -766,6 +767,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = ...@@ -766,6 +767,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
{WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_RESOURCE_STRUCTURED, "", "", {WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_RESOURCE_STRUCTURED, "", "",
shader_sm5_read_dcl_resource_structured}, shader_sm5_read_dcl_resource_structured},
{WINED3D_SM5_OP_STORE_UAV_TYPED, WINED3DSIH_STORE_UAV_TYPED, "U", "iu"}, {WINED3D_SM5_OP_STORE_UAV_TYPED, WINED3DSIH_STORE_UAV_TYPED, "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"},
}; };
......
...@@ -641,6 +641,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER ...@@ -641,6 +641,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_LABEL, WINED3DSIH_LABEL,
WINED3DSIH_LD, WINED3DSIH_LD,
WINED3DSIH_LD2DMS, WINED3DSIH_LD2DMS,
WINED3DSIH_LD_RAW,
WINED3DSIH_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED,
WINED3DSIH_LIT, WINED3DSIH_LIT,
WINED3DSIH_LOG, WINED3DSIH_LOG,
......
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