Wine-commits

Download

wine-commits@list.winehq.org

October 2023

1 participants
702 discussions

Giovanni Mascellani : ci: Update the README with some recent changes.
by Alexandre Julliard 02 Oct '23

02 Oct '23

Module: vkd3d Branch: master Commit: d10e94d8d578c90337fdbc4455ea95c385461716 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d10e94d8d578c90337fdbc4455ea9… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Oct 2 11:41:29 2023 +0200 ci: Update the README with some recent changes. --- gitlab/README | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gitlab/README b/gitlab/README index ffcb09f6..04fd6111 100644 --- a/gitlab/README +++ b/gitlab/README @@ -14,8 +14,17 @@ 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); and on macOS, on Intel, using MoltenVK as Vulkan driver. The -testing logs are available as CI artifacts. +GPU). vkd3d is also tested on macOS, with an Intel processor, using +MoltenVK as the Vulkan driver. The llvmpipe and macOS jobs are +currently allowed to fail. + +Additionally, MinGW is used to build PE binaries for both vkd3d and +its crosstests, for both 32 and 64 bit. These builds are not currently +tested (but the pipeline still fails if the compilation is not +successful). + +The testing logs are available as CI artifacts, as well as the PE +modules built by the crosstest and MinGW jobs. 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

1 0

Giovanni Mascellani : vkd3d-dxbc: Print section offsets.
by Alexandre Julliard 02 Oct '23

02 Oct '23

Module: vkd3d Branch: master Commit: 6743439e9727d67bc1ec13396b6c03da8d494877 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6743439e9727d67bc1ec13396b6c0… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Sep 28 14:59:37 2023 +0200 vkd3d-dxbc: Print section offsets. --- programs/vkd3d-dxbc/main.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/programs/vkd3d-dxbc/main.c b/programs/vkd3d-dxbc/main.c index ea425f09..b6786b71 100644 --- a/programs/vkd3d-dxbc/main.c +++ b/programs/vkd3d-dxbc/main.c @@ -323,7 +323,8 @@ static void dump_data(const struct colours *colours, const char *prefix, const s printf("%s%s%08zx%s\n", prefix, colours->offset, data->size, colours->reset); } -static void dump_dxbc(const struct vkd3d_shader_dxbc_desc *dxbc_desc, const struct options *options) +static void dump_dxbc(const struct vkd3d_shader_code *dxbc, const struct vkd3d_shader_dxbc_desc *dxbc_desc, + const struct options *options) { const struct colours *colours = &options->colours; struct vkd3d_shader_dxbc_section_desc *section; @@ -341,17 +342,24 @@ static void dump_dxbc(const struct vkd3d_shader_dxbc_desc *dxbc_desc, const stru printf(" %ssize%s: %#zx (%zu) bytes\n", colours->label, colours->reset, dxbc_desc->size, dxbc_desc->size); printf(" %ssections%s: %zu\n\n", colours->label, colours->reset, dxbc_desc->section_count); - printf(" %s#%s %stag%s %ssize%s\n", + printf(" %s#%s %stag%s %ssize (bytes)%s %soffset (bytes)%s\n", + colours->label, colours->reset, colours->label, colours->reset, colours->label, colours->reset, colours->label, colours->reset); for (i = 0; i < dxbc_desc->section_count; ++i) { + char dec_size[32]; + size_t offset; + section = &dxbc_desc->sections[i]; - printf("%s%2zu%s %08x (%.4s) 0x%08zx (%zu) bytes\n", + sprintf(dec_size, "(%zu)", section->data.size); + offset = (char *)section->data.code - (char *)dxbc->code; + printf("%s%2zu%s %08x (%.4s) 0x%08zx %-13s 0x%08zx (%zu)\n", colours->index, i, colours->reset, section->tag, dump_tag(tag, section->tag), - section->data.size, section->data.size); + section->data.size, dec_size, + offset, offset); if (!options->list_data) continue; @@ -409,7 +417,7 @@ int main(int argc, char **argv) goto done; if (options.list || options.list_data) - dump_dxbc(&dxbc_desc, &options); + dump_dxbc(&dxbc, &dxbc_desc, &options); vkd3d_shader_free_dxbc(&dxbc_desc); vkd3d_shader_free_shader_code(&dxbc);

1 0

Jump to page: