Wine-Commits

wine-commits@list.winehq.org

October 2023

1 participants
702 discussions

Giovanni Mascellani : ci: Store config.log as a build artifact.
by Alexandre Julliard Oct. 2, 2023

Oct. 2, 2023

Module: vkd3d Branch: master Commit: ef77d78a397f695bcac66ef1d52bfc5625a4a72e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ef77d78a397f695bcac66ef1d52bf… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Sep 28 10:15:30 2023 +0200 ci: Store config.log as a build artifact. --- gitlab/build-crosstest | 2 +- gitlab/build-linux | 2 +- gitlab/build-mac | 2 +- gitlab/build-mingw | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gitlab/build-crosstest b/gitlab/build-crosstest index 15b4d031..38eb3e11 100755 --- a/gitlab/build-crosstest +++ b/gitlab/build-crosstest @@ -19,6 +19,6 @@ cd build touch ../pipeline_failed mkdir -p ../artifacts/$COMMIT -rsync -Rr tests/*.exe ../artifacts/$COMMIT +rsync -Rr config.log tests/*.exe ../artifacts/$COMMIT git reset --hard diff --git a/gitlab/build-linux b/gitlab/build-linux index cc8faa5b..661180f5 100755 --- a/gitlab/build-linux +++ b/gitlab/build-linux @@ -17,6 +17,6 @@ cd build touch ../pipeline_failed mkdir -p ../artifacts/$COMMIT -rsync -Rr doc/* test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT +rsync -Rr config.log doc/* test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT git reset --hard diff --git a/gitlab/build-mac b/gitlab/build-mac index aeed0988..854bc8e3 100755 --- a/gitlab/build-mac +++ b/gitlab/build-mac @@ -17,6 +17,6 @@ cd build touch ../pipeline_failed mkdir -p ../artifacts/$COMMIT -rsync -Rr test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT +rsync -Rr config.log test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT git reset --hard diff --git a/gitlab/build-mingw b/gitlab/build-mingw index f06e3861..59c5a928 100755 --- a/gitlab/build-mingw +++ b/gitlab/build-mingw @@ -19,6 +19,7 @@ cp -r /usr/include/vulkan /usr/include/vk_video /usr/include/spirv vulkan-header touch ../pipeline_failed mkdir -p ../artifacts/$COMMIT +cp config.log ../artifacts/$COMMIT cp destdir/usr/local/bin/* ../artifacts/$COMMIT git reset --hard

1 0

Giovanni Mascellani : vkd3d-dxbc: Print section offsets.
by Alexandre Julliard Oct. 2, 2023

Oct. 2, 2023

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: