[PATCH vkd3d v2 1/2] vkd3d-shader: Normalize descriptor declaration registers to SM5.1.
Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 28 +++++++++++++++++++++------- libs/vkd3d-shader/trace.c | 13 +++++++++---- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 4bc62014..b81ac976 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -637,8 +637,8 @@ static void shader_sm4_read_shader_data(struct vkd3d_shader_instruction *ins, static void shader_sm4_set_descriptor_register_range(struct vkd3d_sm4_data *priv, struct vkd3d_shader_register *reg, struct vkd3d_shader_register_range *range) { - range->first = reg->idx[shader_is_sm_5_1(priv) ? 1 : 0].offset; - range->last = reg->idx[shader_is_sm_5_1(priv) ? 2 : 0].offset; + range->first = reg->idx[1].offset; + range->last = reg->idx[shader_is_sm_5_1(priv) ? 2 : 1].offset; if (range->last < range->first) { FIXME("Invalid register range [%u:%u].\n", range->first, range->last); @@ -1516,6 +1516,21 @@ static bool shader_sm4_read_reg_idx(struct vkd3d_sm4_data *priv, const DWORD **p return true; } +static bool sm4_register_is_descriptor(enum vkd3d_sm4_register_type register_type) +{ + switch (register_type) + { + case VKD3D_SM4_RT_SAMPLER: + case VKD3D_SM4_RT_RESOURCE: + case VKD3D_SM4_RT_CONSTBUFFER: + case VKD3D_SM5_RT_UAV: + return true; + + default: + return false; + } +} + static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum vkd3d_data_type data_type, struct vkd3d_shader_register *param, enum vkd3d_shader_src_modifier *modifier) @@ -1667,13 +1682,12 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr break; } } - else if (register_type == VKD3D_SM4_RT_CONSTBUFFER && order == 2) + else if (!shader_is_sm_5_1(priv) && sm4_register_is_descriptor(register_type)) { - /* SM5.1 places the buffer offset in idx[2]; earlier versions place it - * in idx[1]. Normalize to SM5.1. */ + /* SM5.1 places a symbol identifier in idx[0] and moves + * other values up one slot. Normalize to SM5.1. */ param->idx[2] = param->idx[1]; - param->idx[1].rel_addr = NULL; - param->idx[1].offset = 0; + param->idx[1] = param->idx[0]; } map_register(priv, param); diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 2d16714b..79a60897 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -766,6 +766,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const { struct vkd3d_string_buffer *buffer = &compiler->buffer; unsigned int offset = reg->idx[0].offset; + bool is_descriptor = false; static const char * const rastout_reg_names[] = {"oPos", "oFog", "oPts"}; static const char * const misctype_reg_names[] = {"vPos", "vFace"}; @@ -847,6 +848,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const case VKD3DSPR_SAMPLER: shader_addline(buffer, "s"); + is_descriptor = true; break; case VKD3DSPR_MISCTYPE: @@ -871,6 +873,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const case VKD3DSPR_CONSTBUFFER: shader_addline(buffer, "cb"); + is_descriptor = true; break; case VKD3DSPR_IMMCONSTBUFFER: @@ -891,10 +894,12 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const case VKD3DSPR_RESOURCE: shader_addline(buffer, "t"); + is_descriptor = true; break; case VKD3DSPR_UAV: shader_addline(buffer, "u"); + is_descriptor = true; break; case VKD3DSPR_OUTPOINTID: @@ -1057,11 +1062,11 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const vkd3d_string_buffer_printf(buffer, "%u%s", offset, compiler->colours.reset); } - /* For CBs in sm < 5.1 we move the buffer offset from idx[1] to idx[2] - * to normalise it with 5.1. - * Here we should ignore it if it's a CB in sm < 5.1. */ + /* For descriptors in sm < 5.1 we move the reg->idx values up one slot + * to normalise with 5.1. + * Here we should ignore it if it's a descriptor in sm < 5.1. */ if (reg->idx[1].offset != ~0u && - (reg->type != VKD3DSPR_CONSTBUFFER || shader_ver_ge(&compiler->shader_version, 5, 1))) + (!is_descriptor || shader_ver_ge(&compiler->shader_version, 5, 1))) shader_print_subscript(compiler, reg->idx[1].offset, reg->idx[1].rel_addr); if (reg->idx[2].offset != ~0u) -- 2.31.1
Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 51 +++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 79a60897..bb347a94 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -762,7 +762,18 @@ static void shader_print_subscript(struct vkd3d_d3d_asm_compiler *compiler, shader_print_uint_literal(compiler, "", offset, "]"); } -static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const struct vkd3d_shader_register *reg) +static void shader_print_subscript_range(struct vkd3d_d3d_asm_compiler *compiler, + unsigned int offset_first, unsigned int offset_last) +{ + shader_print_uint_literal(compiler, "[", offset_first, ":"); + if (offset_last != ~0u) + shader_print_uint_literal(compiler, "", offset_last, "]"); + else + vkd3d_string_buffer_printf(&compiler->buffer, "*]"); +} + +static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const struct vkd3d_shader_register *reg, + bool is_declaration) { struct vkd3d_string_buffer *buffer = &compiler->buffer; unsigned int offset = reg->idx[0].offset; @@ -1049,6 +1060,8 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const { if (offset != ~0u) { + bool is_sm_5_1 = shader_ver_ge(&compiler->shader_version, 5, 1); + if (reg->idx[0].rel_addr || reg->type == VKD3DSPR_IMMCONSTBUFFER || reg->type == VKD3DSPR_INCONTROLPOINT || (reg->type == VKD3DSPR_INPUT && (compiler->shader_version.type == VKD3D_SHADER_TYPE_GEOMETRY @@ -1062,15 +1075,23 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const vkd3d_string_buffer_printf(buffer, "%u%s", offset, compiler->colours.reset); } - /* For descriptors in sm < 5.1 we move the reg->idx values up one slot - * to normalise with 5.1. - * Here we should ignore it if it's a descriptor in sm < 5.1. */ - if (reg->idx[1].offset != ~0u && - (!is_descriptor || shader_ver_ge(&compiler->shader_version, 5, 1))) - shader_print_subscript(compiler, reg->idx[1].offset, reg->idx[1].rel_addr); - - if (reg->idx[2].offset != ~0u) - shader_print_subscript(compiler, reg->idx[2].offset, reg->idx[2].rel_addr); + /* For sm 5.1 descriptor declarations we need to print the register range instead of + * a single register index. */ + if (is_descriptor && is_declaration && is_sm_5_1) + { + shader_print_subscript_range(compiler, reg->idx[1].offset, reg->idx[2].offset); + } + else + { + /* For descriptors in sm < 5.1 we move the reg->idx values up one slot + * to normalise with 5.1. + * Here we should ignore it if it's a descriptor in sm < 5.1. */ + if (reg->idx[1].offset != ~0u && (!is_descriptor || is_sm_5_1)) + shader_print_subscript(compiler, reg->idx[1].offset, reg->idx[1].rel_addr); + + if (reg->idx[2].offset != ~0u) + shader_print_subscript(compiler, reg->idx[2].offset, reg->idx[2].rel_addr); + } } else { @@ -1092,7 +1113,7 @@ static void shader_dump_dst_param(struct vkd3d_d3d_asm_compiler *compiler, struct vkd3d_string_buffer *buffer = &compiler->buffer; uint32_t write_mask = param->write_mask; - shader_dump_register(compiler, ¶m->reg); + shader_dump_register(compiler, ¶m->reg, true); if (write_mask) { @@ -1132,7 +1153,7 @@ static void shader_dump_src_param(struct vkd3d_d3d_asm_compiler *compiler, if (src_modifier == VKD3DSPSM_ABS || src_modifier == VKD3DSPSM_ABSNEG) shader_addline(buffer, "|"); - shader_dump_register(compiler, ¶m->reg); + shader_dump_register(compiler, ¶m->reg, false); switch (src_modifier) { @@ -1432,13 +1453,13 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, shader_dump_decl_usage(compiler, &ins->declaration.semantic, ins->flags); shader_dump_ins_modifiers(compiler, &ins->declaration.semantic.resource.reg); vkd3d_string_buffer_printf(buffer, "%s ", compiler->colours.reset); - shader_dump_register(compiler, &ins->declaration.semantic.resource.reg.reg); + shader_dump_register(compiler, &ins->declaration.semantic.resource.reg.reg, true); shader_dump_register_space(compiler, ins->declaration.semantic.resource.range.space); break; case VKD3DSIH_DCL_CONSTANT_BUFFER: vkd3d_string_buffer_printf(buffer, " "); - shader_dump_register(compiler, &ins->declaration.cb.src.reg); + shader_dump_register(compiler, &ins->declaration.cb.src.reg, true); if (shader_ver_ge(&compiler->shader_version, 5, 1)) shader_print_subscript(compiler, ins->declaration.cb.size, NULL); shader_addline(buffer, ", %s", @@ -1548,7 +1569,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, case VKD3DSIH_DCL_SAMPLER: vkd3d_string_buffer_printf(buffer, " "); - shader_dump_register(compiler, &ins->declaration.sampler.src.reg); + shader_dump_register(compiler, &ins->declaration.sampler.src.reg, true); if (ins->flags == VKD3DSI_SAMPLER_COMPARISON_MODE) shader_addline(buffer, ", comparisonMode"); shader_dump_register_space(compiler, ins->declaration.sampler.range.space); -- 2.31.1
On Thu, 8 Jul 2021 at 06:54, Conor McCarthy <cmccarthy(a)codeweavers.com> wrote:
@@ -1092,7 +1113,7 @@ static void shader_dump_dst_param(struct vkd3d_d3d_asm_compiler *compiler, struct vkd3d_string_buffer *buffer = &compiler->buffer; uint32_t write_mask = param->write_mask;
- shader_dump_register(compiler, ¶m->reg); + shader_dump_register(compiler, ¶m->reg, true);
That doesn't seem accurate. And indeed, I'm seeing some changes like this in a couple of shaders: -store_uav_typed u0[r0.y + 1].xyzw, l(0, 0, 0, 0), r0.x +store_uav_typed u0[1:*].xyzw, l(0, 0, 0, 0), r0.x
The title should instead be "Normalize descriptor registers to SM5.1" as the change is not limited to declarations.
participants (2)
-
Conor McCarthy -
Henri Verbeet