[PATCH 2/3] vkd3d-shader: Normalize descriptor declaration registers to SM5.1.
Conor McCarthy
cmccarthy at codeweavers.com
Tue Jul 6 20:20:15 CDT 2021
Signed-off-by: Conor McCarthy <cmccarthy at codeweavers.com>
---
libs/vkd3d-shader/dxbc.c | 28 +++++++++++++-----
libs/vkd3d-shader/trace.c | 60 +++++++++++++++++++++------------------
2 files changed, 54 insertions(+), 34 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..8da877b4 100644
--- a/libs/vkd3d-shader/trace.c
+++ b/libs/vkd3d-shader/trace.c
@@ -762,7 +762,8 @@ 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_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const struct vkd3d_shader_register *reg,
+ bool is_descriptor_declaration)
{
struct vkd3d_string_buffer *buffer = &compiler->buffer;
unsigned int offset = reg->idx[0].offset;
@@ -1057,15 +1058,20 @@ 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. */
- if (reg->idx[1].offset != ~0u &&
- (reg->type != VKD3DSPR_CONSTBUFFER || shader_ver_ge(&compiler->shader_version, 5, 1)))
- shader_print_subscript(compiler, reg->idx[1].offset, reg->idx[1].rel_addr);
+ /* For descriptors in sm < 5.1 we move the reg->idx values up one slot
+ * to normalise with 5.1. */
+ if (shader_ver_ge(&compiler->shader_version, 5, 1) && is_descriptor_declaration)
+ {
+ shader_print_subscript(compiler, reg->idx[1].offset, NULL);
+ }
+ else
+ {
+ if (reg->idx[1].offset != ~0u)
+ 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);
+ if (reg->idx[2].offset != ~0u)
+ shader_print_subscript(compiler, reg->idx[2].offset, reg->idx[2].rel_addr);
+ }
}
else
{
@@ -1082,12 +1088,12 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const
}
static void shader_dump_dst_param(struct vkd3d_d3d_asm_compiler *compiler,
- const struct vkd3d_shader_dst_param *param)
+ const struct vkd3d_shader_dst_param *param, bool is_descriptor_declaration)
{
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, is_descriptor_declaration);
if (write_mask)
{
@@ -1127,7 +1133,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)
{
@@ -1427,13 +1433,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",
@@ -1472,7 +1478,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler,
case VKD3DSIH_DCL_INDEX_RANGE:
vkd3d_string_buffer_printf(buffer, " ");
- shader_dump_dst_param(compiler, &ins->declaration.index_range.dst);
+ shader_dump_dst_param(compiler, &ins->declaration.index_range.dst, false);
shader_print_uint_literal(compiler, " ", ins->declaration.index_range.register_count, "");
break;
@@ -1487,7 +1493,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler,
vkd3d_string_buffer_printf(buffer, " ");
shader_dump_interpolation_mode(compiler, ins->flags);
shader_addline(buffer, " ");
- shader_dump_dst_param(compiler, &ins->declaration.dst);
+ shader_dump_dst_param(compiler, &ins->declaration.dst, false);
break;
case VKD3DSIH_DCL_INPUT_PS_SGV:
@@ -1495,7 +1501,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler,
case VKD3DSIH_DCL_INPUT_SIV:
case VKD3DSIH_DCL_OUTPUT_SIV:
vkd3d_string_buffer_printf(buffer, " ");
- shader_dump_dst_param(compiler, &ins->declaration.register_semantic.reg);
+ shader_dump_dst_param(compiler, &ins->declaration.register_semantic.reg, false);
shader_addline(buffer, ", ");
shader_dump_shader_input_sysval_semantic(compiler, ins->declaration.register_semantic.sysval_semantic);
break;
@@ -1504,7 +1510,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler,
vkd3d_string_buffer_printf(buffer, " ");
shader_dump_interpolation_mode(compiler, ins->flags);
shader_addline(buffer, " ");
- shader_dump_dst_param(compiler, &ins->declaration.register_semantic.reg);
+ shader_dump_dst_param(compiler, &ins->declaration.register_semantic.reg, false);
shader_addline(buffer, ", ");
shader_dump_shader_input_sysval_semantic(compiler, ins->declaration.register_semantic.sysval_semantic);
break;
@@ -1512,7 +1518,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler,
case VKD3DSIH_DCL_INPUT:
case VKD3DSIH_DCL_OUTPUT:
vkd3d_string_buffer_printf(buffer, " ");
- shader_dump_dst_param(compiler, &ins->declaration.dst);
+ shader_dump_dst_param(compiler, &ins->declaration.dst, false);
break;
case VKD3DSIH_DCL_INPUT_PRIMITIVE:
@@ -1530,20 +1536,20 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler,
case VKD3DSIH_DCL_RESOURCE_RAW:
vkd3d_string_buffer_printf(buffer, " ");
- shader_dump_dst_param(compiler, &ins->declaration.raw_resource.resource.reg);
+ shader_dump_dst_param(compiler, &ins->declaration.raw_resource.resource.reg, true);
shader_dump_register_space(compiler, ins->declaration.raw_resource.resource.range.space);
break;
case VKD3DSIH_DCL_RESOURCE_STRUCTURED:
vkd3d_string_buffer_printf(buffer, " ");
- shader_dump_dst_param(compiler, &ins->declaration.structured_resource.resource.reg);
+ shader_dump_dst_param(compiler, &ins->declaration.structured_resource.resource.reg, true);
shader_print_uint_literal(compiler, ", ", ins->declaration.structured_resource.byte_stride, "");
shader_dump_register_space(compiler, ins->declaration.structured_resource.resource.range.space);
break;
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);
@@ -1576,13 +1582,13 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler,
case VKD3DSIH_DCL_TGSM_RAW:
vkd3d_string_buffer_printf(buffer, " ");
- shader_dump_dst_param(compiler, &ins->declaration.tgsm_raw.reg);
+ shader_dump_dst_param(compiler, &ins->declaration.tgsm_raw.reg, false);
shader_print_uint_literal(compiler, ", ", ins->declaration.tgsm_raw.byte_count, "");
break;
case VKD3DSIH_DCL_TGSM_STRUCTURED:
vkd3d_string_buffer_printf(buffer, " ");
- shader_dump_dst_param(compiler, &ins->declaration.tgsm_structured.reg);
+ shader_dump_dst_param(compiler, &ins->declaration.tgsm_structured.reg, false);
shader_print_uint_literal(compiler, ", ", ins->declaration.tgsm_structured.byte_stride, "");
shader_print_uint_literal(compiler, ", ", ins->declaration.tgsm_structured.structure_count, "");
break;
@@ -1596,14 +1602,14 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler,
case VKD3DSIH_DCL_UAV_RAW:
shader_dump_uav_flags(compiler, ins->flags);
shader_addline(buffer, " ");
- shader_dump_dst_param(compiler, &ins->declaration.raw_resource.resource.reg);
+ shader_dump_dst_param(compiler, &ins->declaration.raw_resource.resource.reg, true);
shader_dump_register_space(compiler, ins->declaration.raw_resource.resource.range.space);
break;
case VKD3DSIH_DCL_UAV_STRUCTURED:
shader_dump_uav_flags(compiler, ins->flags);
shader_addline(buffer, " ");
- shader_dump_dst_param(compiler, &ins->declaration.structured_resource.resource.reg);
+ shader_dump_dst_param(compiler, &ins->declaration.structured_resource.resource.reg, true);
shader_print_uint_literal(compiler, ", ", ins->declaration.structured_resource.byte_stride, "");
shader_dump_register_space(compiler, ins->declaration.structured_resource.resource.range.space);
break;
@@ -1666,7 +1672,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler,
{
shader_dump_ins_modifiers(compiler, &ins->dst[i]);
shader_addline(buffer, !i ? " " : ", ");
- shader_dump_dst_param(compiler, &ins->dst[i]);
+ shader_dump_dst_param(compiler, &ins->dst[i], false);
}
/* Other source tokens */
--
2.31.1
More information about the wine-devel
mailing list