September 2020 - Wine-Commits

Isabella Bosia : vkd3d-shader: Always print swizzle except for immediates or samplers.
by Alexandre Julliard Sept. 17, 2020

Sept. 17, 2020

Module: vkd3d Branch: master Commit: d93d76079c81e5faac2b6b501642f08e7eed8ff1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d93d76079c81e5faac2b6b5… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Wed Sep 16 12:45:40 2020 +0100 vkd3d-shader: Always print swizzle except for immediates or samplers. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index f32bdfa..68a90fd 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1051,7 +1051,7 @@ static void shader_dump_src_param(struct vkd3d_string_buffer *buffer, default: shader_addline(buffer, "_unknown_modifier(%#x)", src_modifier); } - if (swizzle != VKD3D_SHADER_NO_SWIZZLE) + if (param->reg.type != VKD3DSPR_IMMCONST && param->reg.type != VKD3DSPR_SAMPLER) { static const char swizzle_chars[] = "xyzw"; DWORD swizzle_x = (swizzle >> VKD3D_SHADER_SWIZZLE_SHIFT(0)) & VKD3D_SHADER_SWIZZLE_MASK;

1 0

Isabella Bosia : vkd3d-shader: Print "output" in tessellator outputs.
by Alexandre Julliard Sept. 17, 2020

Sept. 17, 2020

Module: vkd3d Branch: master Commit: 03e17b3d0c6c47a243744942ae48bb52f98d7e67 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=03e17b3d0c6c47a24374494… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Thu Sep 17 00:00:52 2020 +0100 vkd3d-shader: Print "output" in tessellator outputs. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 3a17c22..10bcfe0 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -441,6 +441,7 @@ static void shader_dump_tessellator_domain(struct vkd3d_string_buffer *buffer, static void shader_dump_tessellator_output_primitive(struct vkd3d_string_buffer *buffer, enum vkd3d_shader_tessellator_output_primitive output_primitive) { + shader_addline(buffer, "output_"); switch (output_primitive) { case VKD3D_SHADER_TESSELLATOR_OUTPUT_POINT:

1 0

Isabella Bosia : vkd3d-shader: Print "domain" in tessellator domains.
by Alexandre Julliard Sept. 17, 2020

Sept. 17, 2020

Module: vkd3d Branch: master Commit: 5b4bd5ad9b4aca2263c3535a1ef7d86fa7d77344 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5b4bd5ad9b4aca2263c3535… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Thu Sep 17 00:00:51 2020 +0100 vkd3d-shader: Print "domain" in tessellator domains. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 68a90fd..3a17c22 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -420,6 +420,7 @@ static void shader_dump_uav_flags(struct vkd3d_string_buffer *buffer, DWORD uav_ static void shader_dump_tessellator_domain(struct vkd3d_string_buffer *buffer, enum vkd3d_tessellator_domain domain) { + shader_addline(buffer, "domain_"); switch (domain) { case VKD3D_TESSELLATOR_DOMAIN_LINE:

1 0

Isabella Bosia : vkd3d-shader: Output "tri" instead of "triangle" in tessellator domains.
by Alexandre Julliard Sept. 17, 2020

Sept. 17, 2020

Module: vkd3d Branch: master Commit: 3c30efe14c4255a0ffa6abd2e9b71af1067b02ea URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3c30efe14c4255a0ffa6abd… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Thu Sep 17 00:00:55 2020 +0100 vkd3d-shader: Output "tri" instead of "triangle" in tessellator domains. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index c487eae..d86a84a 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -427,7 +427,7 @@ static void shader_dump_tessellator_domain(struct vkd3d_string_buffer *buffer, shader_addline(buffer, "isoline"); break; case VKD3D_TESSELLATOR_DOMAIN_TRIANGLE: - shader_addline(buffer, "triangle"); + shader_addline(buffer, "tri"); break; case VKD3D_TESSELLATOR_DOMAIN_QUAD: shader_addline(buffer, "quad");

1 0

Isabella Bosia : vkd3d-shader: Print "partitioning" in tessellator partitions.
by Alexandre Julliard Sept. 17, 2020

Sept. 17, 2020

Module: vkd3d Branch: master Commit: 9aa76a8e4f2b7477514424ee9e7e498459fa1a54 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9aa76a8e4f2b7477514424e… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Thu Sep 17 00:00:53 2020 +0100 vkd3d-shader: Print "partitioning" in tessellator partitions. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 10bcfe0..bcdad28 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -465,6 +465,7 @@ static void shader_dump_tessellator_output_primitive(struct vkd3d_string_buffer static void shader_dump_tessellator_partitioning(struct vkd3d_string_buffer *buffer, enum vkd3d_shader_tessellator_partitioning partitioning) { + shader_addline(buffer, "partitioning_"); switch (partitioning) { case VKD3D_SHADER_TESSELLATOR_PARTITIONING_INTEGER:

1 0

Isabella Bosia : vkd3d-shader: Always print writemask.
by Alexandre Julliard Sept. 17, 2020

Sept. 17, 2020

Module: vkd3d Branch: master Commit: 8eb4c54f73d5a28db77e5fd2a4510946af068f9f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8eb4c54f73d5a28db77e5fd… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Wed Sep 16 12:45:39 2020 +0100 vkd3d-shader: Always print writemask. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 7562e52..f32bdfa 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -994,7 +994,7 @@ static void shader_dump_dst_param(struct vkd3d_string_buffer *buffer, shader_dump_register(buffer, &param->reg, shader_version); - if (write_mask && write_mask != VKD3DSP_WRITEMASK_ALL) + if (write_mask) { static const char write_mask_chars[] = "xyzw";

1 0

Isabella Bosia : vkd3d-shader: Remove [ ] from first index of fp in dcl_interface.
by Alexandre Julliard Sept. 17, 2020

Sept. 17, 2020

Module: vkd3d Branch: master Commit: 1fb3c77cce3a6f1063d4b1292cc7f7187991bb7f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1fb3c77cce3a6f1063d4b12… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Wed Sep 16 12:45:36 2020 +0100 vkd3d-shader: Remove [ ] from first index of fp in dcl_interface. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 7553724..f4d735b 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1375,7 +1375,7 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, break; case VKD3DSIH_DCL_INTERFACE: - shader_addline(buffer, "%s fp[%u][%u][%u] = {...}", + shader_addline(buffer, "%s fp%u[%u][%u] = {...}", shader_opcode_names[ins->handler_idx], ins->declaration.fp.index, ins->declaration.fp.array_size, ins->declaration.fp.body_count); break;

1 0

Isabella Bosia : vkd3d-shader: Remove [ ] from x registers in dcl_indexabletemp.
by Alexandre Julliard Sept. 17, 2020

Sept. 17, 2020

Module: vkd3d Branch: master Commit: 3757b951f38d4369e57889711cda478c735940f6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3757b951f38d4369e578897… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Wed Sep 16 12:45:35 2020 +0100 vkd3d-shader: Remove [ ] from x registers in dcl_indexabletemp. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 3571de8..7553724 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1330,7 +1330,7 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, break; case VKD3DSIH_DCL_INDEXABLE_TEMP: - shader_addline(buffer, "%s x[%u][%u], %u", shader_opcode_names[ins->handler_idx], + shader_addline(buffer, "%s x%u[%u], %u", shader_opcode_names[ins->handler_idx], ins->declaration.indexable_temp.register_idx, ins->declaration.indexable_temp.register_size, ins->declaration.indexable_temp.component_count);

1 0

Isabella Bosia : vkd3d-shader: Only print brackets when necessary.
by Alexandre Julliard Sept. 17, 2020

Sept. 17, 2020

Module: vkd3d Branch: master Commit: 891952e6e60036bd7642c3b2f525600cde99d113 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=891952e6e60036bd7642c3b… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Wed Sep 16 12:45:37 2020 +0100 vkd3d-shader: Only print brackets when necessary. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index f4d735b..6412208 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -937,13 +937,23 @@ static void shader_dump_register(struct vkd3d_string_buffer *buffer, { if (offset != ~0u) { - shader_addline(buffer, "["); + bool printbrackets = reg->idx[0].rel_addr + || reg->type == VKD3DSPR_INCONTROLPOINT + || reg->type == VKD3DSPR_IMMCONSTBUFFER + || ((shader_version->type == VKD3D_SHADER_TYPE_GEOMETRY + || shader_version->type == VKD3D_SHADER_TYPE_HULL) + && reg->type == VKD3DSPR_INPUT); + + if (printbrackets) + shader_addline(buffer, "["); if (reg->idx[0].rel_addr) { shader_dump_src_param(buffer, reg->idx[0].rel_addr, shader_version); shader_addline(buffer, " + "); } - shader_addline(buffer, "%u]", offset); + shader_addline(buffer, "%u", offset); + if (printbrackets) + shader_addline(buffer, "]"); if (reg->idx[1].offset != ~0u) {

1 0

Isabella Bosia : vkd3d-shader: Don't print 1-st index in constant buffers if < 5.1.
by Alexandre Julliard Sept. 17, 2020

Sept. 17, 2020

Module: vkd3d Branch: master Commit: 149a8e311f135f88b24c7fd97cb81273ee1854e5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=149a8e311f135f88b24c7fd… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Wed Sep 16 12:45:38 2020 +0100 vkd3d-shader: Don't print 1-st index in constant buffers if < 5.1. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 6412208..7562e52 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -955,7 +955,11 @@ static void shader_dump_register(struct vkd3d_string_buffer *buffer, if (printbrackets) shader_addline(buffer, "]"); - if (reg->idx[1].offset != ~0u) + /* 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(shader_version, 5, 1))) { shader_addline(buffer, "["); if (reg->idx[1].rel_addr)

1 0