[PATCH 0/1] MR628: vkd3d-shader/dxil: Initialise the register before calling src_param_init_scalar().

[Conor McCarthy (＠cmccarthy)]

Fixes regression in 1f536238a.

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

[PATCH 1/1] vkd3d-shader/dxil: Initialise the register before calling src_param_init_scalar().

[Conor McCarthy]

From: Conor McCarthy <cmccarthy(a)codeweavers.com>

Fixes regression in 1f536238a.
---
 libs/vkd3d-shader/dxil.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c
index ba951a6e5..291012d13 100644
--- a/libs/vkd3d-shader/dxil.c
+++ b/libs/vkd3d-shader/dxil.c
@@ -4725,8 +4725,8 @@ static void sm6_parser_emit_extractval(struct sm6_parser *sm6, const struct dxil
     vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV);
 
     src_param = instruction_src_params_alloc(ins, 1, sm6);
-    src_param_init_scalar(src_param, elem_idx);
     src_param->reg = src->u.reg;
+    src_param_init_scalar(src_param, elem_idx);
 
     instruction_dst_param_init_ssa_scalar(ins, sm6);
 }
-- 
GitLab

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

[PATCH 0/1] MR628: vkd3d-shader/dxil: Initialise the register before calling src_param_init_scalar(). - approved

[Giovanni Mascellani (＠giomasce)]

This merge request was approved by Giovanni Mascellani.
-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/628

[Giovanni Mascellani (＠giomasce)]

Not a problem for me if it's upstreamed independently, but that's already in !607, together with another fix for the same commit.

-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/628#note_60024

[Conor McCarthy (＠cmccarthy)]

It's causing random shader test failures, so I figured the sooner it goes upstream the better. Not necessary if 607 or 611 go upstream soon though.

-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/628#note_60036

[PATCH 0/1] MR628: vkd3d-shader/dxil: Initialise the register before calling src_param_init_scalar(). - closed

[Conor McCarthy (＠cmccarthy)]

This merge request was closed by Conor McCarthy.
-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/628