wine-commits September 2023

wine-commits@winehq.org

1 participants
920 discussions

Francois Gouget : testbot/LogUtils: Don't deduplicate the WineTest task.log files.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: tools Branch: master Commit: ecf535afb7c5d7001a16eabd60f0047f4c5ede7e URL: https://gitlab.winehq.org/winehq/tools/-/commit/ecf535afb7c5d7001a16eabd60f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 26 19:34:13 2023 +0200 testbot/LogUtils: Don't deduplicate the WineTest task.log files. The task.log file for a win32 test run is not redundant with one for a wow64 run. Ideally one would deduplicate the task.log within each category but it's simpler to just not deduplicate them at all. --- testbot/lib/WineTestBot/LogUtils.pm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 56025688..8ea2dd50 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1815,8 +1815,13 @@ sub UpdateLatestReport($$) } } - my $ErrMessage = _DeduplicateLatestReport($RefReportName); - push @ErrMessages, $ErrMessage if (defined $ErrMessage); + # The task.log file for a win32 test run is not redundant with one for a + # wow64 run. So skip deduplication entirely for task.log files. + if ($RefReportName !~ /-task\.log$/) + { + my $ErrMessage = _DeduplicateLatestReport($RefReportName); + push @ErrMessages, $ErrMessage if (defined $ErrMessage); + } return \@ErrMessages; }

1 0

Francois Gouget : testbot/LogUtils: Fix the deduplication reference report regular expression.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: tools Branch: master Commit: 83b26f48a7c3218609db1137e3ba4c32a889b8d0 URL: https://gitlab.winehq.org/winehq/tools/-/commit/83b26f48a7c3218609db1137e3b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 26 19:39:54 2023 +0200 testbot/LogUtils: Fix the deduplication reference report regular expression. Perl does not allow \Q and \E inside RE variables and one of the \E was missing anyway. Also the report names contain a dot. Luckily the VM names cannot contain RE wildcards, and the report names only contain a single dot which should not cause mismatches. --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index ab32fc75..56025688 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1762,7 +1762,7 @@ sub _DeduplicateLatestReport($) my $ErrMessage; my $ReportRE = $RefReportName; - $ReportRE =~ s/^([a-zA-Z0-9_]+)-job[0-9.]+-([a-zA-Z0-9_]+)$/\\Q$1\\E-job[0-9.]+-\\Q$2/; + $ReportRE =~ s/^([a-zA-Z0-9_]+)-job[0-9.]+-([a-zA-Z0-9_.]+)$/$1-job[0-9.]+-$2/; foreach my $LogPath (sort { $LatestAges{$a} <=> $LatestAges{$b} } @LatestPaths) { my $LogName = basename($LogPath);

1 0

Francois Gouget : testbot: Include the step and task number in the reference file logs.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: tools Branch: master Commit: 13631f0cc172671b60755cb2a6c25226fac69824 URL: https://gitlab.winehq.org/winehq/tools/-/commit/13631f0cc172671b60755cb2a6c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 22 02:05:50 2023 +0200 testbot: Include the step and task number in the reference file logs. While the test report name is unique per job when running the full suite (i.e. 1 win32.log, 1 wow32.log, etc), our reference files now include the task.log files and those are not, neither for full test suite jobs, nor for Wine update ones. So to avoid having collisions in the task.log reference file names, use the full jobid.stepno.taskno in their names. --- testbot/bin/Janitor.pl | 2 +- testbot/bin/UpdateTaskLogs | 6 +++--- testbot/lib/WineTestBot/LogUtils.pm | 4 ++-- testbot/lib/WineTestBot/Tasks.pm | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 169bc3cb..4e4b26f8 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -347,7 +347,7 @@ if (opendir(my $dh, "$DataDir/latest")) my $TTL = $JobPurgeDays ? $JobPurgeDays - $Age : undef; # Keep the regexp in sync with WineTestBot::Task::GetRefReportName() - if ($Entry !~ /^[a-zA-Z0-9_]+-job[0-9]+-[a-zA-Z0-9_]+\.(?:log|report)(?:\.errors)?$/) + if ($Entry !~ /^[a-zA-Z0-9_]+-job[0-9.]+-[a-zA-Z0-9_]+\.(?:log|report)(?:\.errors)?$/) { my $Deletion = defined $TTL ? " (deletion in $TTL days)" : ""; Error "Found a suspicious file$Deletion: latest/$Entry\n"; diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index b2357250..985e1dc0 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -218,7 +218,7 @@ sub DoUpdateLatestReport($$$) my ($Task, $ReportName, $SrcReportPath) = @_; # Keep the name as is when saving an existing reference report - my $SrcIsRef = ($SrcReportPath =~ /-job\d+-/); + my $SrcIsRef = ($SrcReportPath =~ /-job[0-9.]+-/); my $RefReportName = $SrcIsRef ? basename($SrcReportPath) : $Task->GetRefReportName($ReportName); return 0 if ($LatestFiles{$RefReportName}); @@ -504,11 +504,11 @@ sub ProcessLatestReports() } # Then perform cleanups and rebuild missing files - foreach my $LatestReportPath (glob("$LatestGlob $LatestGlob.errors")) + foreach my $LatestReportPath (glob("$LatestGlob.report $LatestGlob.report.errors $LatestGlob.log $LatestGlob.log.errors")) { my $RefReportName = basename($LatestReportPath); # Keep the regexp in sync with WineTestBot::Task::GetRefReportName() - next if ($RefReportName !~ /^([a-zA-Z0-9_]+-job[0-9]+-[a-zA-Z0-9_]+\.report)(?:\.errors)?$/); + next if ($RefReportName !~ /^([a-zA-Z0-9_]+-job[0-9.]+-[a-zA-Z0-9_]+\.report)(?:\.errors)?$/); $RefReportName = $1; # untaint $LatestReportPath = "$DataDir/latest/$RefReportName"; $Rc += Delete("$LatestReportPath.err"); diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index f660274e..ab32fc75 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1745,7 +1745,7 @@ sub _DeduplicateLatestReport($) my ($RefReportName) = @_; my $LatestGlob = $RefReportName; - $LatestGlob =~ s/-job\d+-/-job*-/; + $LatestGlob =~ s/-job[0-9.]+-/-job*-/; my @LatestPaths = glob("$DataDir/latest/$LatestGlob"); return undef if (@LatestPaths <= 1); @@ -1762,7 +1762,7 @@ sub _DeduplicateLatestReport($) my $ErrMessage; my $ReportRE = $RefReportName; - $ReportRE =~ s/^([a-zA-Z0-9_]+)-job\d+-([a-zA-Z0-9_]+)$/\\Q$1\\E-job[0-9]+-\\Q$2/; + $ReportRE =~ s/^([a-zA-Z0-9_]+)-job[0-9.]+-([a-zA-Z0-9_]+)$/\\Q$1\\E-job[0-9.]+-\\Q$2/; foreach my $LogPath (sort { $LatestAges{$a} <=> $LatestAges{$b} } @LatestPaths) { my $LogName = basename($LogPath); diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index b6332d2d..41ac0c58 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -139,7 +139,7 @@ sub GetReportNames($) sub GetRefReportName($$) { my ($self, $ReportName) = @_; - return sprintf("%s-job%06d-%s", $self->VM->Name, $self->JobId, $ReportName); + return sprintf("%s-job%06d.%d.%d-%s", $self->VM->Name, $self->JobId, $self->StepNo, $self->No, $ReportName); } sub GetRefReportPaths($$;$$) @@ -156,7 +156,7 @@ sub GetRefReportPaths($$;$$) my %RefReportPaths; foreach my $RefReportPath (glob($RefGlob)) { - next if ($RefReportPath !~ m~^\Q$Dir\E/(\Q$VMName\E-job[0-9]+-\Q$ReportName\E)$ExtraRE$~); + next if ($RefReportPath !~ m~^\Q$Dir\E/(\Q$VMName\E-job[0-9.]+-\Q$ReportName\E)$ExtraRE$~); my $RefReportName = $1; # untaint next if ($RefReportPaths{$RefReportName}); $RefReportPaths{$RefReportName} = "$Dir/$RefReportName";

1 0

Giovanni Mascellani : ci: Do not drop artifacts after 1 day.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: vkd3d Branch: master Commit: 3113f167babdf657618915234a60421fb728c699 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3113f167babdf657618915234a604… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Sep 5 16:24:37 2023 +0200 ci: Do not drop artifacts after 1 day. There is no point in using such a short timeout. We trust the GitLab instance to already have a sensible default. --- gitlab/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/gitlab/build.yml b/gitlab/build.yml index 3b67f93e..0eac7722 100644 --- a/gitlab/build.yml +++ b/gitlab/build.yml @@ -21,7 +21,6 @@ - if [ -f pipeline_failed ] ; then exit 1 ; fi artifacts: when: always - expire_in: 1 day paths: - artifacts

1 0

Giovanni Mascellani : ci: Run the tests on macOS.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: vkd3d Branch: master Commit: d72c91ef9732c446f18766cc7bc8ef4c49de8aff URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d72c91ef9732c446f18766cc7bc8e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Aug 31 22:55:46 2023 +0200 ci: Run the tests on macOS. --- gitlab/README | 11 +++++++++- gitlab/build-mac | 19 +++++++++++++++++ gitlab/build.yml | 50 +++++++++++++++++++++++++++++++++++++++----- gitlab/patch_moltenvk_icd.sh | 12 +++++++++++ 4 files changed, 86 insertions(+), 6 deletions(-) diff --git a/gitlab/README b/gitlab/README index ef4d0bed..ffcb09f6 100644 --- a/gitlab/README +++ b/gitlab/README @@ -14,7 +14,8 @@ The file build.yml contains the actual testing targets. Currently vkd3d is tested on Linux, on x86-64 and i386, each architecture with two different Vulkan drivers (both from Mesa): llvmpipe (a software implementation) and RADV (a hardware implementation backed by an AMD -GPU). The testing logs are available as CI artifacts. +GPU); and on macOS, on Intel, using MoltenVK as Vulkan driver. The +testing logs are available as CI artifacts. Some custom runner configuration is required in order to run the tests on an AMD GPU. Specifically, a runner tagged with `amd-gpu' must be @@ -40,3 +41,11 @@ available with the following features: is created dynamically, therefore has no predictable GID: the use of a fixed GID enables the guest system to be set up so that the user running the tests can access the render nodes. + +A runner on an Intel macOS system tagged with `mac' must also be +available to run the macOS tests. Unfortunately a system like Docker +is not available in this case to provide an isolated standard +environment for running the tests. All the software required to +compile and run the tests will therefore have to be installed directly +on the host system. Complete instructions to setup the macOS are +currently not available. diff --git a/gitlab/build-mac b/gitlab/build-mac new file mode 100755 index 00000000..e423330e --- /dev/null +++ b/gitlab/build-mac @@ -0,0 +1,19 @@ +#!/bin/bash + +echo "Building $(git log -1)" +echo "---" + +COMMIT=$(git rev-parse --short HEAD) + +set -Eeuxo pipefail + +./autogen.sh +rm -fr build +mkdir build +cd build +../configure && make -j$(sysctl -n hw.ncpu) && make -j$(sysctl -n hw.ncpu) crosstest && make -j$(sysctl -n hw.ncpu) check || touch ../pipeline_failed + +mkdir -p ../artifacts/$COMMIT +rsync -Rr tests/*.exe test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT + +git reset --hard diff --git a/gitlab/build.yml b/gitlab/build.yml index 780d645b..3b67f93e 100644 --- a/gitlab/build.yml +++ b/gitlab/build.yml @@ -1,4 +1,4 @@ -.build: +.build-linux: stage: build rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' @@ -26,20 +26,20 @@ - artifacts build-radv-64: - extends: .build + extends: .build-linux tags: - amd-gpu variables: VK_LOADER_DRIVERS_SELECT: 'radeon_*' build-llvmpipe-64: - extends: .build + extends: .build-linux allow_failure: true variables: VK_LOADER_DRIVERS_SELECT: 'lvp_*' build-radv-32: - extends: .build + extends: .build-linux tags: - amd-gpu variables: @@ -47,8 +47,48 @@ build-radv-32: CC: 'gcc -m32' build-llvmpipe-32: - extends: .build + extends: .build-linux allow_failure: true variables: VK_LOADER_DRIVERS_SELECT: 'lvp_*' CC: 'gcc -m32' + +build-mac: + stage: build + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + allow_failure: true + interruptible: true + needs: [] + dependencies: [] + tags: + - mac + script: + - git config --global --add safe.directory $CI_PROJECT_DIR + - git clean -fdx + - git reset --hard + - rm -fr .git/rebase-merge + # We use a custom ICD which is not marked as a portability driver, + # so that test programs are not confused. + - ./gitlab/patch_moltenvk_icd.sh + - export VK_DRIVER_FILES="$PWD/gitlab/MoltenVK_icd.json" + - mkdir artifacts + - system_profiler SPSoftwareDataType SPHardwareDataType > artifacts/systeminfo.txt + - vulkaninfo > artifacts/vulkaninfo.txt + - export PATH="/usr/local/opt/bison/bin:/usr/local/opt/flex/bin:$PATH" + - git clone --depth 1 --branch wine-3.21 https://gitlab.winehq.org/wine/wine.git + - cd wine + - mkdir build + - cd build + - ../configure --enable-win64 --without-x --without-freetype + - make tools/widl/widl + - cd ../.. + - export PATH="$PWD/wine/build/tools/widl:$PATH" + - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./gitlab/build-mac + - if [ -f pipeline_failed ] ; then exit 1 ; fi + variables: + VKD3D_DISABLE_EXTENSIONS: "VK_EXT_descriptor_indexing" + artifacts: + when: always + paths: + - artifacts diff --git a/gitlab/patch_moltenvk_icd.sh b/gitlab/patch_moltenvk_icd.sh new file mode 100755 index 00000000..ad90a4ea --- /dev/null +++ b/gitlab/patch_moltenvk_icd.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +BASE_PATH="/usr/local/opt/molten-vk/share/vulkan/icd.d" + +cp "$BASE_PATH/MoltenVK_icd.json" gitlab/MoltenVK_icd.json + +# The driver path is relative +sed -i -e 's|"library_path" *: "|"library_path" : "'"$BASE_PATH/"'|g' gitlab/MoltenVK_icd.json + +# We pretend this is not a portability driver, otherwise vkd3d won't +# find it +sed -i -e 's|"is_portability_driver" *: *true|"is_portability_driver" : false|g' gitlab/MoltenVK_icd.json

1 0

Nikolay Sivov : vkd3d-shader/asm: Tweak TEXCOORD declaration name.
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: vkd3d Branch: master Commit: 45541dd9b2884157999889839c03c9d019dce34d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/45541dd9b2884157999889839c03c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 11 12:41:55 2023 +0200 vkd3d-shader/asm: Tweak TEXCOORD declaration name. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/d3d_asm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index d72402eb..f0c386f1 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -714,7 +714,7 @@ static void shader_dump_decl_usage(struct vkd3d_d3d_asm_compiler *compiler, break; case VKD3D_DECL_USAGE_TEXCOORD: - shader_addline(buffer, "texture%u", semantic->usage_idx); + shader_addline(buffer, "texcoord%u", semantic->usage_idx); break; case VKD3D_DECL_USAGE_TANGENT:

1 0

Nikolay Sivov : vkd3d-shader/d3dbc: Disallow 1D sampler types when writing sampler declaration.
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: vkd3d Branch: master Commit: ee6c66eb1bc59cab24bdc060a0e38d9972dfabb1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ee6c66eb1bc59cab24bdc060a0e38… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 11 12:34:25 2023 +0200 vkd3d-shader/d3dbc: Disallow 1D sampler types when writing sampler declaration. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/d3dbc.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 2b02d51f..d5104ae9 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1982,10 +1982,6 @@ static void write_sm1_sampler_dcl(struct hlsl_ctx *ctx, struct vkd3d_bytecode_bu switch (sampler_dim) { - case HLSL_SAMPLER_DIM_1D: - res_type = VKD3D_SM1_RESOURCE_TEXTURE_1D; - break; - case HLSL_SAMPLER_DIM_2D: res_type = VKD3D_SM1_RESOURCE_TEXTURE_2D; break;

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Produce 2D resource declarations and loads for tex1D().
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: vkd3d Branch: master Commit: 177ea3bcbde9bbe6456c8fd2a872fc5ee6884b1b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/177ea3bcbde9bbe6456c8fd2a872f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 11 12:23:04 2023 +0200 vkd3d-shader/hlsl: Produce 2D resource declarations and loads for tex1D(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 37 +++++++++++++++++++++++++++++++- tests/hlsl/combined-samplers.shader_test | 6 +++--- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 67fd9f6f..fb6d485e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3457,7 +3457,42 @@ static bool intrinsic_tex(struct hlsl_ctx *ctx, const struct parse_initializer * if (!(coords = add_implicit_conversion(ctx, params->instrs, params->args[1], hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, hlsl_sampler_dim_count(dim)), loc))) - coords = params->args[1]; + { + return false; + } + + /* tex1D() functions never produce 1D resource declarations. For newer profiles half offset + is used for the second coordinate, while older ones appear to replicate first coordinate.*/ + if (dim == HLSL_SAMPLER_DIM_1D) + { + struct hlsl_ir_load *load; + struct hlsl_ir_node *half; + struct hlsl_ir_var *var; + unsigned int idx = 0; + + if (!(var = hlsl_new_synthetic_var(ctx, "coords", hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, 2), loc))) + return false; + + initialize_var_components(ctx, params->instrs, var, &idx, coords); + if (shader_profile_version_ge(ctx, 4, 0)) + { + if (!(half = hlsl_new_float_constant(ctx, 0.5f, loc))) + return false; + hlsl_block_add_instr(params->instrs, half); + + initialize_var_components(ctx, params->instrs, var, &idx, half); + } + else + initialize_var_components(ctx, params->instrs, var, &idx, coords); + + if (!(load = hlsl_new_var_load(ctx, var, loc))) + return false; + hlsl_block_add_instr(params->instrs, &load->node); + + coords = &load->node; + + dim = HLSL_SAMPLER_DIM_2D; + } load_params.coords = coords; load_params.resource = params->args[0]; diff --git a/tests/hlsl/combined-samplers.shader_test b/tests/hlsl/combined-samplers.shader_test index 57644c26..465c11cb 100644 --- a/tests/hlsl/combined-samplers.shader_test +++ b/tests/hlsl/combined-samplers.shader_test @@ -121,7 +121,7 @@ float4 main() : sv_target } -[pixel shader todo] +[pixel shader] sampler sam[2]; float4 main() : sv_target @@ -130,8 +130,8 @@ float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (1, 1, 1, 11) +draw quad +probe all rgba (1, 1, 1, 11) [require]

1 0

Giovanni Mascellani : tests: Compile HLSL shaders at runtime in test_unknown_dsv_format().
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: vkd3d Branch: master Commit: 61b403a0325d3dc2b6d9c6c38c340a44b2111ddd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/61b403a0325d3dc2b6d9c6c38c340… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sat Sep 9 23:00:34 2023 +0200 tests: Compile HLSL shaders at runtime in test_unknown_dsv_format(). --- tests/d3d12.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 804b85bd..0748ab6d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5700,40 +5700,37 @@ static void test_unknown_dsv_format(void) D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; ID3D12GraphicsCommandList *command_list; struct depth_stencil_resource ds; + D3D12_SHADER_BYTECODE ps_color; D3D12_CLEAR_VALUE clear_value; struct test_context_desc desc; struct test_context context; ID3D12CommandQueue *queue; + ID3D10Blob *bytecode; HRESULT hr; - static const DWORD ps_color_code[] = - { -#if 0 - float4 color; + static const char ps_color_code[] = + "float4 color;\n" + "\n" + "float4 main(float4 position : SV_POSITION) : SV_Target\n" + "{\n" + " return color;\n" + "}\n"; - float4 main(float4 position : SV_POSITION) : SV_Target - { - return color; - } -#endif - 0x43425844, 0xd18ead43, 0x8b8264c1, 0x9c0a062d, 0xfc843226, 0x00000001, 0x000000e0, 0x00000003, - 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, - 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, - 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, - 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000044, 0x00000050, - 0x00000011, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, - 0x00000000, 0x06000036, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, - }; - static const D3D12_SHADER_BYTECODE ps_color = {ps_color_code, sizeof(ps_color_code)}; static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + bytecode = compile_shader(ps_color_code, sizeof(ps_color_code) - 1, "ps_4_0"); + ps_color = shader_bytecode_from_blob(bytecode); + memset(&desc, 0, sizeof(desc)); desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT; desc.no_root_signature = true; if (!init_test_context(&context, &desc)) + { + ID3D10Blob_Release(bytecode); return; + } command_list = context.list; queue = context.queue; @@ -5895,6 +5892,8 @@ static void test_unknown_dsv_format(void) destroy_depth_stencil(&ds); destroy_test_context(&context); + + ID3D10Blob_Release(bytecode); } static void test_append_aligned_element(void)

1 0

Giovanni Mascellani : tests: Compile HLSL shaders at runtime in test_unknown_rtv_format().
by Alexandre Julliard 13 Sep '23

13 Sep '23

Module: vkd3d Branch: master Commit: 264ff9e2daec992b86c738a53e5860f05e0bfd0b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/264ff9e2daec992b86c738a53e586… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sat Sep 9 22:56:46 2023 +0200 tests: Compile HLSL shaders at runtime in test_unknown_rtv_format(). --- tests/d3d12.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 7b12e0e0..804b85bd 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5598,35 +5598,30 @@ static void test_unknown_rtv_format(void) struct test_context_desc desc; struct test_context context; ID3D12CommandQueue *queue; + D3D12_SHADER_BYTECODE ps; + ID3D10Blob *bytecode; unsigned int i; HRESULT hr; - static const DWORD ps_code[] = - { -#if 0 - void main(out float4 target1 : SV_Target1, out float4 target2 : SV_Target2) - { - target1 = float4(2.0f, 0.0f, 0.0f, 1.0f); - target2 = float4(3.0f, 0.0f, 0.0f, 1.0f); - } -#endif - 0x43425844, 0x980554be, 0xb8743fb0, 0xf5bb8deb, 0x639feaf8, 0x00000001, 0x000000f4, 0x00000003, - 0x0000002c, 0x0000003c, 0x00000088, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, - 0x00000044, 0x00000002, 0x00000008, 0x00000038, 0x00000001, 0x00000000, 0x00000003, 0x00000001, - 0x0000000f, 0x00000038, 0x00000002, 0x00000000, 0x00000003, 0x00000002, 0x0000000f, 0x545f5653, - 0x65677261, 0xabab0074, 0x52444853, 0x00000064, 0x00000040, 0x00000019, 0x03000065, 0x001020f2, - 0x00000001, 0x03000065, 0x001020f2, 0x00000002, 0x08000036, 0x001020f2, 0x00000001, 0x00004002, - 0x40000000, 0x00000000, 0x00000000, 0x3f800000, 0x08000036, 0x001020f2, 0x00000002, 0x00004002, - 0x40400000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, - }; - static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const char ps_code[] = + "void main(out float4 target1 : SV_Target1, out float4 target2 : SV_Target2)\n" + "{\n" + " target1 = float4(2.0f, 0.0f, 0.0f, 1.0f);\n" + " target2 = float4(3.0f, 0.0f, 0.0f, 1.0f);\n" + "}\n"; + + bytecode = compile_shader(ps_code, sizeof(ps_code) - 1, "ps_4_0"); + ps = shader_bytecode_from_blob(bytecode); memset(&desc, 0, sizeof(desc)); desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT; desc.rt_descriptor_count = 16; desc.no_pipeline = true; if (!init_test_context(&context, &desc)) + { + ID3D10Blob_Release(bytecode); return; + } command_list = context.list; queue = context.queue; @@ -5696,6 +5691,8 @@ static void test_unknown_rtv_format(void) ID3D12Resource_Release(render_targets[i]); destroy_depth_stencil(&ds); destroy_test_context(&context); + + ID3D10Blob_Release(bytecode); } static void test_unknown_dsv_format(void)

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
92
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2023