[PATCH 0/1] MR3317: d3dcompiler/tests: Add another test for matrix majority flags.

[Nikolay Sivov (＠nsivov)]

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3317

[PATCH 1/1] d3dcompiler/tests: Add another test for matrix majority flags.

[Nikolay Sivov]

From: Nikolay Sivov <nsivov(a)codeweavers.com>

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c
index 9fe79b1ac44..1ba283f4d99 100644
--- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c
+++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c
@@ -907,6 +907,7 @@ static void test_majority(void)
         { ps_column_source, { 0.1f, 0.5f, 0.1f, 0.5f } },
         { ps_no_modifiers_source, { 0.1f, 0.2f, 0.1f, 0.2f }, D3DCOMPILE_PACK_MATRIX_ROW_MAJOR },
         { ps_no_modifiers_source, { 0.1f, 0.5f, 0.1f, 0.5f }, D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR },
+        { ps_no_modifiers_source, { 0.1f, 0.2f, 0.1f, 0.2f }, D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR | D3DCOMPILE_PACK_MATRIX_ROW_MAJOR },
         { ps_pragmas_source, { 0.1f, 0.2f, 0.1f, 0.5f }, D3DCOMPILE_PACK_MATRIX_ROW_MAJOR },
         { ps_pragmas_source, { 0.1f, 0.2f, 0.1f, 0.5f }, D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR },
     };
@@ -955,7 +956,7 @@ static void test_majority(void)
             draw_quad(test_context.device, ps_code);
 
             v = get_color_vec4(test_context.device, 0, 0);
-            todo_wine_if(i == 4)
+            todo_wine_if(i == 4 || i == 6)
             ok(compare_vec4(&v, c->x, c->y, c->z, c->w, 1),
                 "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w);
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/3317

[PATCH 0/1] MR3317: d3dcompiler/tests: Add another test for matrix majority flags. - approved

[Matteo Bruni (＠Mystral)]

This merge request was approved by Matteo Bruni.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3317

[Matteo Bruni (＠Mystral)]

I don't think this is what @zfigura was asking for in https://gitlab.winehq.org/wine/wine/-/merge_requests/3263#note_38726 but it still seems like a useful test to have :smile:

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3317#note_39046

[Nikolay Sivov (＠nsivov)]

Ah, I see, it could conflict with variable modifiers too. I'll add some for that. CLI frontend on windows checks for flags conflicting with each other - in this case when both row and column are specified, apparently it's not something that D3DCompile() handles.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3317#note_39048