May 2023 - Wine-Commits - list.winehq.org

Francisco Casas : tests: Test array types with semantics.
by Alexandre Julliard May 1, 2023

May 1, 2023

Module: vkd3d Branch: master Commit: f1276f9fb903553e1c97206b5a6c3761568a6a94 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f1276f9fb903553e1c97206b5a6c3… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Apr 4 19:46:16 2023 -0400 tests: Test array types with semantics. --- tests/entry-point-semantics.shader_test | 152 ++++++++++++++++++++++++++++++++ 1 file changed, 152 insertions(+) diff --git a/tests/entry-point-semantics.shader_test b/tests/entry-point-semantics.shader_test index a32a0e7b..5b28b54a 100644 --- a/tests/entry-point-semantics.shader_test +++ b/tests/entry-point-semantics.shader_test @@ -50,3 +50,155 @@ float4 main(float tex : bogus) : bogus; [test] draw quad probe (0, 0) rgba (0.2, 0.2, 0.2, 0.2) + + +[vertex shader todo] +void main(out float4 tex[4] : texcoord, inout float4 pos : sv_position) +{ + tex[0] = float4(10.0, 11.0, 12.0, 13.0); + tex[1] = float4(20.0, 21.0, 22.0, 23.0); + tex[2] = float4(30.0, 31.0, 32.0, 33.0); + tex[3] = float4(40.0, 41.0, 42.0, 43.0); +} + + +% Array parameters of non-struct elements must have a semantic. +[pixel shader fail] +float4 main(in float2 arr[2]) : sv_target +{ + return 0.0; +} + + +% Array elements with a semantic get successive indexes. +[pixel shader todo] +struct apple +{ + float3 tp[4] : TEXCOORD0; +}; + +float4 main(in apple a) : sv_target +{ + return float4(a.tp[0].x, a.tp[1].x, a.tp[2].x, a.tp[3].x); +} + +[test] +todo draw quad +todo probe (0, 0) rgba (10.0, 20.0, 30.0, 40.0) + + +% Arrays of matrices get successive indexes. +[pixel shader todo] +struct apple +{ + float4x2 tp[2] : TEXCOORD0; +}; + +float4 main(in apple a) : sv_target +{ + return float4(a.tp[0][0].x, a.tp[0][1].x, a.tp[1][0].x, a.tp[1][1].x); +} + +[test] +todo draw quad +todo probe (0, 0) rgba (10.0, 11.0, 30.0, 31.0) + + +% Arrays (even multi-dimensional) of struct elements are allowed. The fields in the different struct +% elements get the same indexes. +[pixel shader todo] +struct apple +{ + float4 tc0 : TEXCOORD0; + float4 tc1 : TEXCOORD1; +}; + +float4 main(in apple aps[2][2]) : sv_target +{ + return float4(aps[0][0].tc0.x, aps[1][1].tc0.x, aps[0][0].tc1.x, aps[1][1].tc1.x); +} + +[test] +todo draw quad +todo probe (0, 0) rgba (10.0, 10.0, 20.0, 20.0) + + +[pixel shader todo] +struct apple +{ + float4 tc0 : TEXCOORD0; +}; + +struct banana +{ + apple apl; + float4 tc1 : TEXCOORD1; +}; + +float4 main(in banana bans[2]) : sv_target +{ + return float4(bans[0].apl.tc0.xy, bans[1].tc1.xy); +} + +[test] +todo draw quad +todo probe (0, 0) rgba (10.0, 11.0, 20.0, 21.0) + + +[pixel shader fail] +struct apple +{ + float2 miss; // missing semantic. +}; + +struct banana +{ + apple apl[2]; + float4 arb : UNUSED; +}; + +float4 main(in banana bans[2]) : sv_target +{ + return 0.0; +} + + +[vertex shader fail] +struct apple +{ + float2 miss; // missing semantic. +}; + +struct banana +{ + apple apl[2]; + float4 arb : UNUSED; +}; + +void main(out banana bans[2]) +{ + return 0.0; +} + + +[vertex shader todo] +struct apple +{ + float4 tex[2] : TEXCOORD0; +}; + +void main(out apple apl, inout float4 pos : sv_position) +{ + apl.tex[0] = float4(1, 2, 3, 4); + apl.tex[1] = float4(10, 20, 30, 40); +} + +[pixel shader] +float4 main(in float4 tex0 : TEXCOORD0, in float4 tex1 : TEXCOORD1) : sv_target +{ + return float4(tex0.xy, tex1.xy); +} + +[test] +todo draw quad +todo probe (0, 0) rgba (1.0, 2.0, 10.0, 20.0)

1 0

Francisco Casas : tests: Map unindentified hrs on compilation.
by Alexandre Julliard May 1, 2023

May 1, 2023

Module: vkd3d Branch: master Commit: 627678a632ad552447baa636bbfad4b268813edc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/627678a632ad552447baa636bbfad… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Apr 20 11:09:05 2023 -0400 tests: Map unindentified hrs on compilation. --- tests/shader_runner.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 214b1213..f1d93457 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -716,6 +716,16 @@ unsigned int get_vb_stride(const struct shader_runner *runner, unsigned int slot return stride; } +static HRESULT map_unidentified_hrs(HRESULT hr) +{ + if (hr == 0x80010064) + { + trace("Mapping unindentified hr %#x as %#x.\n", hr, E_FAIL); + return E_FAIL; + } + return hr; +} + static void compile_shader(struct shader_runner *runner, const char *source, size_t len, const char *type, HRESULT expect) { ID3D10Blob *blob = NULL, *errors = NULL; @@ -733,6 +743,7 @@ static void compile_shader(struct shader_runner *runner, const char *source, siz sprintf(profile, "%s_%s", type, shader_models[runner->minimum_shader_model]); hr = D3DCompile(source, len, NULL, NULL, NULL, "main", profile, 0, 0, &blob, &errors); + hr = map_unidentified_hrs(hr); ok(hr == expect, "Got unexpected hr %#x.\n", hr); if (hr == S_OK) {

1 0

Francisco Casas : vkd3d-shader/hlsl: Avoid invalid input/output copies for non-numeric types.
by Alexandre Julliard May 1, 2023

May 1, 2023

Module: vkd3d Branch: master Commit: 61c72a4fd1a2aaf7b688b27f81dd09790b8dcc69 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/61c72a4fd1a2aaf7b688b27f81dd0… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Apr 5 12:45:33 2023 -0400 vkd3d-shader/hlsl: Avoid invalid input/output copies for non-numeric types. --- libs/vkd3d-shader/hlsl_codegen.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 42f8ab3b..314ef4ff 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -263,6 +263,16 @@ static void prepend_input_copy(struct hlsl_ctx *ctx, struct list *instrs, struct struct hlsl_ir_var *var = lhs->src.var; unsigned int i; + if (type->class > HLSL_CLASS_LAST_NUMERIC) + { + struct vkd3d_string_buffer *string; + if (!(string = hlsl_type_to_string(ctx, type))) + return; + hlsl_fixme(ctx, &var->loc, "Input semantics for type %s.", string->buffer); + hlsl_release_string_buffer(ctx, string); + return; + } + vector_type = hlsl_get_vector_type(ctx, type->base_type, hlsl_type_minor_size(type)); for (i = 0; i < hlsl_type_major_size(type); ++i) @@ -358,6 +368,16 @@ static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct struct hlsl_ir_var *var = rhs->src.var; unsigned int i; + if (type->class > HLSL_CLASS_LAST_NUMERIC) + { + struct vkd3d_string_buffer *string; + if (!(string = hlsl_type_to_string(ctx, type))) + return; + hlsl_fixme(ctx, &var->loc, "Output semantics for type %s.", string->buffer); + hlsl_release_string_buffer(ctx, string); + return; + } + vector_type = hlsl_get_vector_type(ctx, type->base_type, hlsl_type_minor_size(type)); for (i = 0; i < hlsl_type_major_size(type); ++i)

1 0

Francisco Casas : tests: Allow invalid vertex shader tests.
by Alexandre Julliard May 1, 2023

May 1, 2023

Module: vkd3d Branch: master Commit: 9cc1c7fe9d834ad080a606f954db2cce41464863 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9cc1c7fe9d834ad080a606f954db2… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Apr 4 19:23:26 2023 -0400 tests: Allow invalid vertex shader tests. --- tests/shader_runner.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 961d2fe0..214b1213 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -87,6 +87,7 @@ enum parse_state STATE_SHADER_PIXEL, STATE_SHADER_PIXEL_TODO, STATE_SHADER_VERTEX, + STATE_SHADER_VERTEX_TODO, STATE_TEST, }; @@ -824,7 +825,9 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o break; case STATE_SHADER_VERTEX: - compile_shader(runner, shader_source, shader_source_len, "vs", expect_hr); + case STATE_SHADER_VERTEX_TODO: + todo_if (state == STATE_SHADER_VERTEX_TODO) + compile_shader(runner, shader_source, shader_source_len, "vs", expect_hr); free(runner->vs_source); runner->vs_source = shader_source; shader_source = NULL; @@ -1031,6 +1034,21 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o state = STATE_SHADER_VERTEX; expect_hr = S_OK; } + else if (!strcmp(line, "[vertex shader todo]\n")) + { + state = STATE_SHADER_VERTEX_TODO; + expect_hr = S_OK; + } + else if (!strcmp(line, "[vertex shader fail]\n")) + { + state = STATE_SHADER_VERTEX; + expect_hr = E_FAIL; + } + else if (!strcmp(line, "[vertex shader fail todo]\n")) + { + state = STATE_SHADER_VERTEX_TODO; + expect_hr = E_FAIL; + } else if (!strcmp(line, "[input layout]\n")) { state = STATE_INPUT_LAYOUT; @@ -1061,6 +1079,7 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o case STATE_SHADER_PIXEL: case STATE_SHADER_PIXEL_TODO: case STATE_SHADER_VERTEX: + case STATE_SHADER_VERTEX_TODO: { size_t len = strlen(line);

1 0

Francisco Casas : tests: Expect S_OK result on [vertex shader].
by Alexandre Julliard May 1, 2023

May 1, 2023

Module: vkd3d Branch: master Commit: 877fd3f0b449838ac79e39509abc1619f5723a1d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/877fd3f0b449838ac79e39509abc1… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Apr 4 18:59:43 2023 -0400 tests: Expect S_OK result on [vertex shader]. --- tests/shader_runner.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 8e66948e..961d2fe0 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -1029,6 +1029,7 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o else if (!strcmp(line, "[vertex shader]\n")) { state = STATE_SHADER_VERTEX; + expect_hr = S_OK; } else if (!strcmp(line, "[input layout]\n")) {

1 0