November 2020 - Wine-Devel - list.winehq.org

[PATCH] ntdll: fix backward compatibility for struct link_map on FreeBSD

by Damjan Jovanovic

Checking for the _rtld_version_laddr_offset symbol only works when header and library versions match. Checking for the offset of l_addr instead lets us use the older header with the new library too. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ntdll/unix/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

Nov. 30, 2020

[PATCH 2/2] server: Set console renderer thread in get_next_console_request.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 2 ++ 1 file changed, 2 insertions(+)

Nov. 30, 2020

[PATCH 1/2] server: Remove no longer needed free_console.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 30 +++++++----------------------- server/process.c | 4 +--- server/process.h | 1 - 3 files changed, 8 insertions(+), 27 deletions(-)

Nov. 30, 2020

Re: [PATCH vkd3d v2 3/3] vkd3d-compiler: Default to HLSL as a source format when preprocessing.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=82790 Your paranoid android. === debiant (build log) === Task: Patch failed to apply === debiant (build log) === Task: Patch failed to apply

Nov. 30, 2020

Re: [PATCH vkd3d v2 2/3] vkd3d-compiler: Check whether the source format is binary when checking if the output is a tty, whe

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=82789 Your paranoid android. === debiant (build log) === Task: Patch failed to apply === debiant (build log) === Task: Patch failed to apply

Nov. 30, 2020

Re: [PATCH vkd3d v2 1/3] vkd3d-compiler: Do not validate the target type when preprocessing.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=82788 Your paranoid android. === debiant (build log) === Task: Patch failed to apply === debiant (build log) === Task: Patch failed to apply

Nov. 30, 2020

Re: [PATCH vkd3d 4/4] vkd3d-compiler: Default to HLSL as a source format when preprocessing.

by Henri Verbeet

On Mon, 30 Nov 2020 at 20:34, Zebediah Figura (she/her) <zfigura(a)codeweavers.com> wrote: > On 11/30/20 7:05 AM, Henri Verbeet wrote: > > On Fri, 27 Nov 2020 at 20:01, Zebediah Figura (she/her) > > <zfigura(a)codeweavers.com> wrote: > >> [Perhaps we should also add something like > >> vkd3d_shader_get_supported_preprocessor_types()?] > > Possibly, although at least initially we could probably get away with > > simply returning a copy of the input for source formats that do not > > have an inherent associated preprocessor. > > > That's a good idea, actually; I hadn't thought of that. That does mean > that for backwards compatibility's sake there's not a lot of point in > later adding vkd3d_shader_get_supported_preprocessor_types(). Not as long as we stick to the standard preprocessor for each source format, no. But if we did want to add e.g. a m4 preprocessor, we could do something like the following: enum vkd3d_shader_preprocessor { VKD3D_SHADER_PREPROCESSOR_NONE, /* Or VKD3D_SHADER_PREPROCESSOR_IDENTITY, if you prefer. */ VKD3D_SHADER_PREPROCESSOR_HLSL, VKD3D_SHADER_PREPROCESSOR_M4, ... }; struct vkd3d_shader_preprocess2_info { enum vkd3d_shader_preprocessor preprocessor; ... }; const enum vkd3d_shader_preprocessor *vkd3d_shader_get_supported_preprocessors( enum vkd3d_shader_source_type source_type, unsigned int *count); I wouldn't necessarily expect a lot of demand for that feature though.

Nov. 30, 2020

[PATCH vkd3d v2 3/3] vkd3d-compiler: Default to HLSL as a source format when preprocessing.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 91c8e04f..f1e597a0 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -397,8 +397,8 @@ static bool parse_command_line(int argc, char **argv, struct options *options) }; memset(options, 0, sizeof(*options)); - options->source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; - options->target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; + options->source_type = VKD3D_SHADER_SOURCE_NONE; + options->target_type = VKD3D_SHADER_TARGET_NONE; options->formatting = VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT | VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER; @@ -483,6 +483,11 @@ static bool parse_command_line(int argc, char **argv, struct options *options) if (options->print_target_types) return true; + if (options->source_type == VKD3D_SHADER_SOURCE_NONE) + options->source_type = options->preprocess_only ? VKD3D_SHADER_SOURCE_HLSL : VKD3D_SHADER_SOURCE_DXBC_TPF; + if (options->target_type == VKD3D_SHADER_TARGET_NONE && !options->preprocess_only) + options->target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; + if (!options->preprocess_only && !validate_target_type(options->source_type, options->target_type)) { fprintf(stderr, "Target type '%s' is invalid for source type '%s'.\n", -- 2.29.2

Nov. 30, 2020

[PATCH vkd3d v2 2/3] vkd3d-compiler: Check whether the source format is binary when checking if the output is a tty, when preprocessing.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index b79396e9..91c8e04f 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -639,12 +639,21 @@ int main(int argc, char **argv) if (!(output = open_output(options.output_filename, &close_output))) goto done; - if (!options.output_filename && get_target_type_info(options.target_type)->is_binary - && isatty(fileno(output))) + if (!options.output_filename && isatty(fileno(output))) { - fprintf(stderr, "Output is a tty and output format is binary, exiting.\n" - "If this is really what you intended, specify the output explicitly.\n"); - goto done; + bool is_binary; + + if (options.preprocess_only) + is_binary = get_source_type_info(options.source_type)->is_binary; + else + is_binary = get_target_type_info(options.target_type)->is_binary; + + if (is_binary) + { + fprintf(stderr, "Output is a tty and output format is binary, exiting.\n" + "If this is really what you intended, specify the output explicitly.\n"); + goto done; + } } if (!options.explicit_colour && has_colour(output)) -- 2.29.2

Nov. 30, 2020

[PATCH vkd3d v2 1/3] vkd3d-compiler: Do not validate the target type when preprocessing.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index cec2ebb1..b79396e9 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -483,7 +483,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) if (options->print_target_types) return true; - if (!validate_target_type(options->source_type, options->target_type)) + if (!options->preprocess_only && !validate_target_type(options->source_type, options->target_type)) { fprintf(stderr, "Target type '%s' is invalid for source type '%s'.\n", get_target_type_info(options->target_type)->name, -- 2.29.2

Nov. 30, 2020