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

wined3d: Recognize SM5 swapc opcode.

parent bd405f6b
...@@ -5367,6 +5367,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL ...@@ -5367,6 +5367,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_STORE_STRUCTURED */ 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_SWAPC */ NULL,
/* WINED3DSIH_SWITCH */ NULL, /* WINED3DSIH_SWITCH */ NULL,
/* WINED3DSIH_TEX */ pshader_hw_tex, /* WINED3DSIH_TEX */ pshader_hw_tex,
/* WINED3DSIH_TEXBEM */ pshader_hw_texbem, /* WINED3DSIH_TEXBEM */ pshader_hw_texbem,
......
...@@ -8719,6 +8719,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB ...@@ -8719,6 +8719,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_STORE_STRUCTURED */ 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_SWAPC */ NULL,
/* WINED3DSIH_SWITCH */ shader_glsl_switch, /* WINED3DSIH_SWITCH */ shader_glsl_switch,
/* WINED3DSIH_TEX */ shader_glsl_tex, /* WINED3DSIH_TEX */ shader_glsl_tex,
/* WINED3DSIH_TEXBEM */ shader_glsl_texbem, /* WINED3DSIH_TEXBEM */ shader_glsl_texbem,
......
...@@ -197,6 +197,7 @@ static const char * const shader_opcode_names[] = ...@@ -197,6 +197,7 @@ static const char * const shader_opcode_names[] =
/* WINED3DSIH_STORE_STRUCTURED */ "store_structured", /* 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_SWAPC */ "swapc",
/* WINED3DSIH_SWITCH */ "switch", /* WINED3DSIH_SWITCH */ "switch",
/* WINED3DSIH_TEX */ "texld", /* WINED3DSIH_TEX */ "texld",
/* WINED3DSIH_TEXBEM */ "texbem", /* WINED3DSIH_TEXBEM */ "texbem",
......
...@@ -215,6 +215,7 @@ enum wined3d_sm4_opcode ...@@ -215,6 +215,7 @@ enum wined3d_sm4_opcode
WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d,
WINED3D_SM5_OP_GATHER4_C = 0x7e, WINED3D_SM5_OP_GATHER4_C = 0x7e,
WINED3D_SM5_OP_BFI = 0x8c, WINED3D_SM5_OP_BFI = 0x8c,
WINED3D_SM5_OP_SWAPC = 0x8e,
WINED3D_SM5_OP_DCL_STREAM = 0x8f, WINED3D_SM5_OP_DCL_STREAM = 0x8f,
WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT = 0x93, WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT = 0x93,
WINED3D_SM5_OP_DCL_OUTPUT_CONTROL_POINT_COUNT = 0x94, WINED3D_SM5_OP_DCL_OUTPUT_CONTROL_POINT_COUNT = 0x94,
...@@ -808,6 +809,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = ...@@ -808,6 +809,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
{WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "f", "f"},
{WINED3D_SM5_OP_GATHER4_C, WINED3DSIH_GATHER4_C, "f", "fRSf"}, {WINED3D_SM5_OP_GATHER4_C, WINED3DSIH_GATHER4_C, "f", "fRSf"},
{WINED3D_SM5_OP_BFI, WINED3DSIH_BFI, "u", "uuuu"}, {WINED3D_SM5_OP_BFI, WINED3DSIH_BFI, "u", "uuuu"},
{WINED3D_SM5_OP_SWAPC, WINED3DSIH_SWAPC, "ff", "uff"},
{WINED3D_SM5_OP_DCL_STREAM, WINED3DSIH_DCL_STREAM, "", "f"}, {WINED3D_SM5_OP_DCL_STREAM, WINED3DSIH_DCL_STREAM, "", "f"},
{WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT, "", "", {WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT, "", "",
shader_sm5_read_control_point_count}, shader_sm5_read_control_point_count},
......
...@@ -713,6 +713,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER ...@@ -713,6 +713,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_STORE_STRUCTURED, WINED3DSIH_STORE_STRUCTURED,
WINED3DSIH_STORE_UAV_TYPED, WINED3DSIH_STORE_UAV_TYPED,
WINED3DSIH_SUB, WINED3DSIH_SUB,
WINED3DSIH_SWAPC,
WINED3DSIH_SWITCH, WINED3DSIH_SWITCH,
WINED3DSIH_TEX, WINED3DSIH_TEX,
WINED3DSIH_TEXBEM, WINED3DSIH_TEXBEM,
......
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