- Wine-Commits - list.winehq.org

Henri Verbeet : vkd3d-utils: Implement D3DGetInputAndOutputSignatureBlob().
by Alexandre Julliard Oct. 20, 2023

Oct. 20, 2023

Module: vkd3d Branch: master Commit: be8efb9c9cd89d2e58b749f1028eae67b947c625 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/be8efb9c9cd89d2e58b749f1028ea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 21 15:42:25 2023 +0100 vkd3d-utils: Implement D3DGetInputAndOutputSignatureBlob(). --- include/vkd3d_d3dcompiler.h | 1 + include/vkd3d_utils.h | 2 ++ libs/vkd3d-utils/vkd3d_utils.map | 1 + libs/vkd3d-utils/vkd3d_utils_main.c | 7 +++++++ 4 files changed, 11 insertions(+) diff --git a/include/vkd3d_d3dcompiler.h b/include/vkd3d_d3dcompiler.h index f3f46212..2c773cf0 100644 --- a/include/vkd3d_d3dcompiler.h +++ b/include/vkd3d_d3dcompiler.h @@ -90,6 +90,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen HRESULT WINAPI D3DCreateBlob(SIZE_T size, ID3DBlob **blob); HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob); HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_size, ID3DBlob **blob); +HRESULT WINAPI D3DGetInputAndOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename, const D3D_SHADER_MACRO *macros, ID3DInclude *include, ID3DBlob **shader, ID3DBlob **error_messages); diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index 65c86591..886987e8 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -109,6 +109,8 @@ VKD3D_UTILS_API HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob); /** \since 1.10 */ VKD3D_UTILS_API HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_size, ID3DBlob **blob); +/** \since 1.10 */ +VKD3D_UTILS_API HRESULT WINAPI D3DGetInputAndOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); #ifdef __cplusplus } diff --git a/libs/vkd3d-utils/vkd3d_utils.map b/libs/vkd3d-utils/vkd3d_utils.map index 03d87e8a..8cc9248b 100644 --- a/libs/vkd3d-utils/vkd3d_utils.map +++ b/libs/vkd3d-utils/vkd3d_utils.map @@ -13,6 +13,7 @@ global: D3DCreateBlob; D3DGetBlobPart; D3DGetDebugInfo; + D3DGetInputAndOutputSignatureBlob; D3DPreprocess; vkd3d_create_event; vkd3d_destroy_event; diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 85f679d8..4efa7870 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -766,6 +766,13 @@ HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_size, ID3DBlob **bl return get_blob_part(data, data_size, D3D_BLOB_DEBUG_INFO, 0, blob); } +HRESULT WINAPI D3DGetInputAndOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob) +{ + TRACE("data %p, data_size %lu, blob %p.\n", data, data_size, blob); + + return get_blob_part(data, data_size, D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB, 0, blob); +} + void vkd3d_utils_set_log_callback(PFN_vkd3d_log callback) { vkd3d_set_log_callback(callback);

1 0

Henri Verbeet : vkd3d-utils: Implement D3DGetDebugInfo().
by Alexandre Julliard Oct. 20, 2023

Oct. 20, 2023

Module: vkd3d Branch: master Commit: 247eaa6b7db7acec8f3ad0f8fbc572c331b45a09 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/247eaa6b7db7acec8f3ad0f8fbc57… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 21 15:41:51 2023 +0100 vkd3d-utils: Implement D3DGetDebugInfo(). --- include/vkd3d_d3dcompiler.h | 1 + include/vkd3d_utils.h | 2 ++ libs/vkd3d-utils/vkd3d_utils.map | 1 + libs/vkd3d-utils/vkd3d_utils_main.c | 7 +++++++ 4 files changed, 11 insertions(+) diff --git a/include/vkd3d_d3dcompiler.h b/include/vkd3d_d3dcompiler.h index dd203b34..f3f46212 100644 --- a/include/vkd3d_d3dcompiler.h +++ b/include/vkd3d_d3dcompiler.h @@ -89,6 +89,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen ID3DBlob **error_messages); HRESULT WINAPI D3DCreateBlob(SIZE_T size, ID3DBlob **blob); HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob); +HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename, const D3D_SHADER_MACRO *macros, ID3DInclude *include, ID3DBlob **shader, ID3DBlob **error_messages); diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index f1994264..65c86591 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -107,6 +107,8 @@ VKD3D_UTILS_API void vkd3d_utils_set_log_callback(PFN_vkd3d_log callback); /** \since 1.10 */ VKD3D_UTILS_API HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob); +/** \since 1.10 */ +VKD3D_UTILS_API HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_size, ID3DBlob **blob); #ifdef __cplusplus } diff --git a/libs/vkd3d-utils/vkd3d_utils.map b/libs/vkd3d-utils/vkd3d_utils.map index c48c5204..03d87e8a 100644 --- a/libs/vkd3d-utils/vkd3d_utils.map +++ b/libs/vkd3d-utils/vkd3d_utils.map @@ -12,6 +12,7 @@ global: D3DCompile2; D3DCreateBlob; D3DGetBlobPart; + D3DGetDebugInfo; D3DPreprocess; vkd3d_create_event; vkd3d_destroy_event; diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index e98eec7e..85f679d8 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -759,6 +759,13 @@ HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART return get_blob_part(data, data_size, part, flags, blob); } +HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_size, ID3DBlob **blob) +{ + TRACE("data %p, data_size %lu, blob %p.\n", data, data_size, blob); + + return get_blob_part(data, data_size, D3D_BLOB_DEBUG_INFO, 0, blob); +} + void vkd3d_utils_set_log_callback(PFN_vkd3d_log callback) { vkd3d_set_log_callback(callback);

1 0

Giovanni Mascellani : tests: Fix the usage of require directives.
by Alexandre Julliard Oct. 20, 2023

Oct. 20, 2023

Module: vkd3d Branch: master Commit: ca51c359ec7b094697686de28210862336f3dcd5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ca51c359ec7b094697686de282108… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Oct 16 12:45:32 2023 +0200 tests: Fix the usage of require directives. They are reset each time "[require]" is encountered. --- tests/hlsl/combined-samplers.shader_test | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/hlsl/combined-samplers.shader_test b/tests/hlsl/combined-samplers.shader_test index 19038c34..23553759 100644 --- a/tests/hlsl/combined-samplers.shader_test +++ b/tests/hlsl/combined-samplers.shader_test @@ -1,6 +1,7 @@ [require] shader model >= 4.0 shader model < 6.0 +options: backcompat [sampler 0] @@ -35,10 +36,6 @@ size (1, 1) size (1, 1) 4.0 4.0 4.0 1.0 -[require] -shader model < 6.0 -options: backcompat - [pixel shader] sampler sam; @@ -139,6 +136,7 @@ probe all rgba (1, 1, 1, 11) [require] shader model >= 5.0 shader model < 6.0 +options: backcompat [pixel shader todo]

1 0

Henri Verbeet : vkd3d-utils: Implement D3DGetBlobPart().
by Alexandre Julliard Oct. 20, 2023

Oct. 20, 2023

Module: vkd3d Branch: master Commit: b63c8536885fe3a984c1e6b27d4dd000a36aade0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b63c8536885fe3a984c1e6b27d4dd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 21 15:18:40 2023 +0100 vkd3d-utils: Implement D3DGetBlobPart(). This was largely adapted from Wine's d3dcompiler_43, with some style adjustments. --- include/private/vkd3d_common.h | 20 ++ include/vkd3d_d3dcompiler.h | 22 ++ include/vkd3d_utils.h | 7 + libs/vkd3d-shader/vkd3d_shader_private.h | 17 - libs/vkd3d-utils/vkd3d_utils.map | 1 + libs/vkd3d-utils/vkd3d_utils_main.c | 205 +++++++++++ programs/vkd3d-compiler/main.c | 2 - tests/hlsl_d3d12.c | 578 +++++++++++++++++++++++++++++++ 8 files changed, 833 insertions(+), 19 deletions(-)

1 0

Giovanni Mascellani : tests: Remove an irrelevant input from a test.
by Alexandre Julliard Oct. 20, 2023

Oct. 20, 2023

Module: vkd3d Branch: master Commit: ead98ef32987e422b06c5275d3d923e37bea21fd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ead98ef32987e422b06c5275d3d92… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Oct 16 12:01:07 2023 +0200 tests: Remove an irrelevant input from a test. The irrelevant input caused the test to fail on D3D12 for reasons unrelated to the test's goal. --- tests/hlsl/object-references.shader_test | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/hlsl/object-references.shader_test b/tests/hlsl/object-references.shader_test index e7b2bef0..ff405559 100644 --- a/tests/hlsl/object-references.shader_test +++ b/tests/hlsl/object-references.shader_test @@ -226,7 +226,6 @@ size (1, 1) [pixel shader todo fail(sm>=6)] struct apple { Texture2D tex; - float4 fo : COLOR; }; float4 main(struct apple input) : sv_target

1 0

Giovanni Mascellani : tests: Do not test matrix majority on SM1-3.
by Alexandre Julliard Oct. 20, 2023

Oct. 20, 2023

Module: vkd3d Branch: master Commit: d69c04471e542290f984178b1c8b83e1b4529345 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d69c04471e542290f984178b1c8b8… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Oct 16 12:52:55 2023 +0200 tests: Do not test matrix majority on SM1-3. I'm not sure of what's happening here, but it seems that this change fixes a crash when running on Windows in the CI. Since most of the test excludes SM1-3 anyway, this shouldn't be a big loss. --- tests/hlsl/matrix-semantics.shader_test | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/hlsl/matrix-semantics.shader_test b/tests/hlsl/matrix-semantics.shader_test index 082c69c0..e19b6b48 100644 --- a/tests/hlsl/matrix-semantics.shader_test +++ b/tests/hlsl/matrix-semantics.shader_test @@ -1,3 +1,6 @@ +[require] +shader model >= 4.0 + [pixel shader] float4x1 main() : sv_target { @@ -18,9 +21,6 @@ row_major float1x4 main() : sv_target draw quad probe all rgba (1.0, 2.0, 3.0, 4.0) -[require] -shader model >= 4.0 - [render target 0] format r32 float size (640, 480)

1 0

Giovanni Mascellani : tests: Skip processing resources according to [require] directives.
by Alexandre Julliard Oct. 20, 2023

Oct. 20, 2023

Module: vkd3d Branch: master Commit: 0dc40d7c1eda925b830e43d82aedddecde62eccd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0dc40d7c1eda925b830e43d82aedd… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Oct 17 12:01:01 2023 +0200 tests: Skip processing resources according to [require] directives. --- tests/shader_runner.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 9b9d1d9e..59c1408c 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -1081,7 +1081,13 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o break; case STATE_RESOURCE: - set_resource(runner, runner->ops->create_resource(runner, &current_resource)); + /* Not every backend supports every resource type + * (specifically, D3D9 doesn't support UAVs and + * textures with data type other than float). */ + if (!skip_tests) + { + set_resource(runner, runner->ops->create_resource(runner, &current_resource)); + } free(current_resource.data); break;

1 0

Giovanni Mascellani : ci: Properly pass -W flags for cross tests building.
by Alexandre Julliard Oct. 20, 2023

Oct. 20, 2023

Module: vkd3d Branch: master Commit: 54239da20086720221827d3fb930076e751d6a7d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/54239da20086720221827d3fb9300… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Oct 6 16:15:26 2023 +0200 ci: Properly pass -W flags for cross tests building. --- gitlab/build-crosstest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab/build-crosstest b/gitlab/build-crosstest index 38eb3e11..4a1341a0 100755 --- a/gitlab/build-crosstest +++ b/gitlab/build-crosstest @@ -14,7 +14,7 @@ set -Eeuxo pipefail rm -fr build mkdir build cd build -../configure CROSSCC32="i686-w64-mingw32-gcc" CROSSCC64="x86_64-w64-mingw32-gcc" CFLAGS="-g -O2 -Wno-array-bounds -Werror" && \ +../configure CROSSCC64="x86_64-w64-mingw32-gcc -Wno-array-bounds -Werror" CROSSCC32="i686-w64-mingw32-gcc -Wno-array-bounds -Werror" && \ make -j$(nproc) crosstest || \ touch ../pipeline_failed

1 0

Giovanni Mascellani : tests: Do not test integral types for SM1-3.
by Alexandre Julliard Oct. 20, 2023

Oct. 20, 2023

Module: vkd3d Branch: master Commit: 671548494fb0ea7601b3a829642670a3cbfd3cc8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/671548494fb0ea7601b3a82964267… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Oct 16 11:40:34 2023 +0200 tests: Do not test integral types for SM1-3. --- tests/hlsl/sign.shader_test | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/hlsl/sign.shader_test b/tests/hlsl/sign.shader_test index c56d9082..54b95368 100644 --- a/tests/hlsl/sign.shader_test +++ b/tests/hlsl/sign.shader_test @@ -44,6 +44,10 @@ uniform 4 float4 3.0 4.0 0.0 0.0 todo(sm>=6) draw quad probe all rgba (1.0, 1.0, 1.0, 1.0) +[require] +% SM1-3 doesn't support integral types +shader model >= 4.0 + [pixel shader] uniform int f;

1 0

Giovanni Mascellani : tests: Do not use global half values.
by Alexandre Julliard Oct. 20, 2023

Oct. 20, 2023

Module: vkd3d Branch: master Commit: 90f9407b80761e15b8009df5fdcfea1a0153c2a9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/90f9407b80761e15b8009df5fdcfe… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Oct 13 16:55:50 2023 +0200 tests: Do not use global half values. They are not allowed by the native compiler, except in compatibility mode. --- Makefile.am | 1 + tests/hlsl/asfloat.shader_test | 4 ++-- tests/hlsl/asuint.shader_test | 4 ++-- tests/hlsl/cast-to-float.shader_test | 4 ++-- tests/hlsl/cast-to-int.shader_test | 4 ++-- tests/hlsl/cast-to-uint.shader_test | 4 ++-- tests/hlsl/half.shader_test | 23 +++++++++++++++++++++++ 7 files changed, 34 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8364aaa3..2821ddc6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -98,6 +98,7 @@ vkd3d_shader_tests = \ tests/hlsl/gather-offset.shader_test \ tests/hlsl/gather.shader_test \ tests/hlsl/getdimensions.shader_test \ + tests/hlsl/half.shader_test \ tests/hlsl/initializer-flatten.shader_test \ tests/hlsl/initializer-implicit-array.shader_test \ tests/hlsl/initializer-invalid-arg-count.shader_test \ diff --git a/tests/hlsl/asfloat.shader_test b/tests/hlsl/asfloat.shader_test index 00238164..d2c0f9aa 100644 --- a/tests/hlsl/asfloat.shader_test +++ b/tests/hlsl/asfloat.shader_test @@ -5,7 +5,7 @@ shader model >= 4.0 uniform float f; uniform int i; uniform uint u; -uniform half h; +uniform float h; float4 main() : sv_target { @@ -14,7 +14,7 @@ float4 main() : sv_target ret.x = asfloat(f); ret.y = asfloat(i); ret.z = asfloat(u); - ret.w = asfloat(h); + ret.w = asfloat((half)h); return ret; } diff --git a/tests/hlsl/asuint.shader_test b/tests/hlsl/asuint.shader_test index 494229e7..0a2e39e5 100644 --- a/tests/hlsl/asuint.shader_test +++ b/tests/hlsl/asuint.shader_test @@ -5,7 +5,7 @@ shader model >= 4.0 uniform float f; uniform int i; uniform uint u; -uniform half h; +uniform float h; float4 main() : sv_target { @@ -14,7 +14,7 @@ float4 main() : sv_target ret.x = asuint(f); ret.y = asuint(i); ret.z = asuint(u); - ret.w = asuint(h); + ret.w = asuint((half)h); return ret; } diff --git a/tests/hlsl/cast-to-float.shader_test b/tests/hlsl/cast-to-float.shader_test index 69786ecc..7c32acfa 100644 --- a/tests/hlsl/cast-to-float.shader_test +++ b/tests/hlsl/cast-to-float.shader_test @@ -5,11 +5,11 @@ shader model >= 4.0 uniform int i; uniform uint u; uniform bool b; -uniform half h; +uniform float h; float4 main() : sv_target { - return float4(((float)i) + 1.5, ((float)u) - 2.5, ((float)b) / 2, h); + return float4(((float)i) + 1.5, ((float)u) - 2.5, ((float)b) / 2, (half)h); } [test] diff --git a/tests/hlsl/cast-to-int.shader_test b/tests/hlsl/cast-to-int.shader_test index efa60eed..ae566a03 100644 --- a/tests/hlsl/cast-to-int.shader_test +++ b/tests/hlsl/cast-to-int.shader_test @@ -5,7 +5,7 @@ shader model >= 4.0 uniform float f; uniform uint u; uniform bool b; -uniform half h; +uniform float h; float4 main() : sv_target { @@ -14,7 +14,7 @@ float4 main() : sv_target ret.x = ((float)(int)f) - 1.5; ret.y = ((float)(int)u) + 2.5; ret.z = ((float)(int)b) / 2; - ret.w = ((float)(int)h) + 3.5; + ret.w = ((float)(int)(half)h) + 3.5; return ret; } diff --git a/tests/hlsl/cast-to-uint.shader_test b/tests/hlsl/cast-to-uint.shader_test index 66853855..dece99b7 100644 --- a/tests/hlsl/cast-to-uint.shader_test +++ b/tests/hlsl/cast-to-uint.shader_test @@ -5,7 +5,7 @@ shader model >= 4.0 uniform float f; uniform int i; uniform bool b; -uniform half h; +uniform float h; float4 main() : sv_target { @@ -14,7 +14,7 @@ float4 main() : sv_target ret.x = ((float)(uint)f) - 1.5; ret.y = ((float)(uint)i) - 1.5; ret.z = ((float)(uint)b) / 2; - ret.w = ((float)(uint)h) + 0.5; + ret.w = ((float)(uint)(half)h) + 0.5; return ret; } diff --git a/tests/hlsl/half.shader_test b/tests/hlsl/half.shader_test new file mode 100644 index 00000000..95610235 --- /dev/null +++ b/tests/hlsl/half.shader_test @@ -0,0 +1,23 @@ +[pixel shader fail(sm<6) todo] +uniform half h; + +float4 main() : sv_target +{ + return 0; +} + +[require] +options: backcompat + +[pixel shader] +uniform half h; + +float4 main() : sv_target +{ + return h; +} + +[test] +uniform 0 float 10.0 +todo(sm>=6) draw quad +probe all rgba (10.0, 10.0, 10.0, 10.0)

1 0