[PATCH 0/1] MR107: vkd3d-shader/hlsl: Don't map src swizzles for SM1 dp3 and dp4 ops.

[Francisco Casas (＠fcasas)]

Without this patch, dp3 and dp4 map src swizzles to the dst writemask,
which is not correct.

Before b84f560bdf59c35e093e51bfdf9a166c196d3a9b, these ops worked
despite this, because the dst register had, incorrectly, the full
writemask.

To solve this problem, `write_sm1_binary_op_dot()` is introduced,
similarly to `write_sm4_binary_op_dot()`.

This was pointed out by @nsivov in https://bugs.winehq.org/show_bug.cgi?id=54522.

-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/107

[PATCH 1/1] vkd3d-shader/hlsl: Don't map src swizzles for SM1 dp3 and dp4 ops.

[Francisco Casas]

From: Francisco Casas <fcasas(a)codeweavers.com>

Without this patch, dp3 and dp4 map src swizzles to the dst writemask,
which is not correct.

Before b84f560bdf59c35e093e51bfdf9a166c196d3a9b, these ops worked
despite this, because the dst register had, incorrectly, the full
writemask.

To solve this problem, write_sm1_binary_op_dot() is introduced,
similarly to write_sm4_binary_op_dot().
---
 libs/vkd3d-shader/hlsl_sm1.c | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c
index 07f9ceb7..4a62d804 100644
--- a/libs/vkd3d-shader/hlsl_sm1.c
+++ b/libs/vkd3d-shader/hlsl_sm1.c
@@ -525,6 +525,31 @@ static void write_sm1_binary_op(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buff
     write_sm1_instruction(ctx, buffer, &instr);
 }
 
+static void write_sm1_binary_op_dot(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer,
+        D3DSHADER_INSTRUCTION_OPCODE_TYPE opcode, const struct hlsl_reg *dst,
+        const struct hlsl_reg *src1, const struct hlsl_reg *src2)
+{
+    struct sm1_instruction instr =
+    {
+        .opcode = opcode,
+
+        .dst.type = D3DSPR_TEMP,
+        .dst.writemask = dst->writemask,
+        .dst.reg = dst->id,
+        .has_dst = 1,
+
+        .srcs[0].type = D3DSPR_TEMP,
+        .srcs[0].swizzle = hlsl_swizzle_from_writemask(src1->writemask),
+        .srcs[0].reg = src1->id,
+        .srcs[1].type = D3DSPR_TEMP,
+        .srcs[1].swizzle = hlsl_swizzle_from_writemask(src2->writemask),
+        .srcs[1].reg = src2->id,
+        .src_count = 2,
+    };
+
+    write_sm1_instruction(ctx, buffer, &instr);
+}
+
 static void write_sm1_unary_op(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer,
         D3DSHADER_INSTRUCTION_OPCODE_TYPE opcode, const struct hlsl_reg *dst,
         const struct hlsl_reg *src, D3DSHADER_PARAM_SRCMOD_TYPE src_mod, D3DSHADER_PARAM_DSTMOD_TYPE dst_mod)
@@ -738,11 +763,11 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b
             switch (arg1->data_type->dimx)
             {
                 case 4:
-                    write_sm1_binary_op(ctx, buffer, D3DSIO_DP4, &instr->reg, &arg1->reg, &arg2->reg);
+                    write_sm1_binary_op_dot(ctx, buffer, D3DSIO_DP4, &instr->reg, &arg1->reg, &arg2->reg);
                     break;
 
                 case 3:
-                    write_sm1_binary_op(ctx, buffer, D3DSIO_DP3, &instr->reg, &arg1->reg, &arg2->reg);
+                    write_sm1_binary_op_dot(ctx, buffer, D3DSIO_DP3, &instr->reg, &arg1->reg, &arg2->reg);
                     break;
 
                 default:
-- 
GitLab

https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/107

[PATCH 0/1] MR107: vkd3d-shader/hlsl: Don't map src swizzles for SM1 dp3 and dp4 ops. - approved

[Zebediah Figura (＠zfigura)]

This merge request was approved by Zebediah Figura.
-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/107

[Nikolay Sivov (＠nsivov)]

Thanks, I can confirm this fixes the issue from https://bugs.winehq.org/show_bug.cgi?id=54522.

-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/107#note_25376

[Henri Verbeet (＠hverbeet)]

This seems like something we'd want a test for...

-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/107#note_25579

[PATCH 0/1] MR107: vkd3d-shader/hlsl: Don't map src swizzles for SM1 dp3 and dp4 ops. - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.
-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/107

[Zebediah Figura (＠zfigura)]

> This seems like something we'd want a test for...

We have tests for dot-product instructions, but what we'd really need to test here is sm1 interpretation, so sm1 -> spirv or sm1 -> glsl. I'm working on that part...

-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/107#note_25610