[PATCH 0/1] MR5298: wined3d: Do not check the input signature element count for sm4+ shaders in shader_spirv_compile_arguments_init().

[PATCH 1/1] wined3d: Do not check the input signature element count for sm4+ shaders in shader_spirv_compile_arguments_init().

[Henri Verbeet]

From: Henri Verbeet

Shader model 4 fragment shaders can have more than 12 input varyings. That's
fine though, because we don't need to build a varying map for them in the
first place. Note that in principle the ERR in question could still be
triggered by e.g. attempting to use a shader model 4 fragment shader with a
shader model 3 vertex shader.
---
 dlls/wined3d/shader_spirv.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c
index 3919368ac45..d4b30f20424 100644
--- a/dlls/wined3d/shader_spirv.c
+++ b/dlls/wined3d/shader_spirv.c
@@ -169,16 +169,15 @@ static void shader_spirv_compile_arguments_init(struct shader_spirv_compile_argu
         {
             struct wined3d_shader *ps = state->shader[WINED3D_SHADER_TYPE_PIXEL];

-            if (ps)
+            if (shader->reg_maps.shader_version.major < 4 && ps)
             {
                 struct shader_spirv_graphics_program_vk *vs_program = shader->backend_data;
                 struct shader_spirv_graphics_program_vk *ps_program = ps->backend_data;

if (ps_program->signature_info.input.element_count > ARRAY_SIZE(args->u.vs.varying_map))
                     ERR("Unexpected inter-stage varying count %u.\n", ps_program->signature_info.input.element_count);
-                if (shader->reg_maps.shader_version.major < 4)
-                    vkd3d_shader_build_varying_map(&vs_program->signature_info.output,
-                            &ps_program->signature_info.input, &args->u.vs.varying_count, args->u.vs.varying_map);
+                vkd3d_shader_build_varying_map(&vs_program->signature_info.output,
+                        &ps_program->signature_info.input, &args->u.vs.varying_count, args->u.vs.varying_map);
             }
             break;
         }

[PATCH 1/1] wined3d: Do not check the input signature element count for sm4+ shaders in shader_spirv_compile_arguments_i

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=144026

Your paranoid android.

=== debian11b (64 bit WoW report) ===

d3dx10_34:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011E3980.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011BD790.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011A4A10.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011D5950.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011958A0.

d3dx10_35:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011D1B30.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011C1820.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011C3380.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011D1820.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011C1820.

d3dx10_36:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011E39C0.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011E39C0.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 0000000001193A70.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011E39C0.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011E3C50.

d3dx10_37:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011B6120.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 0000000001195C60.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011A49E0.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011F0CB0.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011D49E0.

d3dx10_38:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011B6030.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011D5770.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011D1BF0.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 0000000001195980.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011D19E0.

d3dx10_39:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011D5C20.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 0000000001195800.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011D5B20.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011A4A80.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011E3710.

d3dx10_40:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 0000000001239E70.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 0000000001239E70.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011A4A10.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011A4A10.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011D1EF0.

d3dx10_41:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011BB830.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011E3CC0.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011E3CC0.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011E3CC0.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011958C0.

d3dx10_42:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011E3980.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011E3980.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011A48D0.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011D1820.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011E3980.

d3dx10_43:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011BBA60.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011BB950.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011E3990.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011D5600.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011D57D0.

user32:
input.c:3864: Test succeeded inside todo block: button_down_hwnd_todo 1: got MSG_TEST_WIN hwnd 0000000000A500D6, msg WM_LBUTTONDOWN, wparam 0x1, lparam 0x320032

[PATCH 0/1] MR5298: wined3d: Do not check the input signature element count for sm4+ shaders in shader_spirv_compile_arguments_init(). - approved

[Zebediah Figura (＠zfigura)]

This merge request was approved by Zebediah Figura.

[PATCH 0/1] MR5298: wined3d: Do not check the input signature element count for sm4+ shaders in shader_spirv_compile_arguments_init(). - approved

[Jan Sikorski (＠jsikorski)]

This merge request was approved by Jan Sikorski.