wine-commits October 2018

wine-commits@winehq.org

1 participants
602 discussions

Henri Verbeet : wined3d: Move the "buffer_object" field from struct wined3d_buffer to struct wined3d_buffer_gl.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: wine Branch: master Commit: b579afd30ae48fef03c9333e31c1349d54ed681a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b579afd30ae48fef03c9333e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 29 11:05:08 2018 +0330 wined3d: Move the "buffer_object" field from struct wined3d_buffer to struct wined3d_buffer_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 66 ++++++++++++++++++++++-------------------- dlls/wined3d/context.c | 6 ++-- dlls/wined3d/state.c | 7 +++-- dlls/wined3d/view.c | 7 +++-- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 46 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b579afd30ae48fef03c9…

1 0

Henri Verbeet : wined3d: Don' t bother trying to blit from discarded textures.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: wine Branch: master Commit: c130a028fcf61b57a63ded6ce0cdbed47df1e5bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c130a028fcf61b57a63ded6c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 29 11:05:07 2018 +0330 wined3d: Don't bother trying to blit from discarded textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 71693ad..746599e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3121,6 +3121,15 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ fx->src_color_key.color_space_high_value); } + dst_sub_resource = &dst_texture->sub_resources[dst_sub_resource_idx]; + src_sub_resource = &src_texture->sub_resources[src_sub_resource_idx]; + + if (src_sub_resource->locations & WINED3D_LOCATION_DISCARDED) + { + WARN("Source sub-resource is discarded, nothing to do.\n"); + return WINED3D_OK; + } + SetRect(&src_rect, src_box->left, src_box->top, src_box->right, src_box->bottom); SetRect(&dst_rect, dst_box->left, dst_box->top, dst_box->right, dst_box->bottom); @@ -3202,9 +3211,6 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ TRACE("Colour blit.\n"); - dst_sub_resource = &dst_texture->sub_resources[dst_sub_resource_idx]; - src_sub_resource = &src_texture->sub_resources[src_sub_resource_idx]; - /* In principle this would apply to depth blits as well, but we don't * implement those in the CPU blitter at the moment. */ if ((dst_sub_resource->locations & dst_texture->resource.map_binding)

1 0

Francois Gouget : testbot: Detect if a task failed before starting the tests.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: tools Branch: master Commit: 508e7bbb3943f2dc989cf7c90b871651dee950a8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=508e7bbb3943f2dc989cf7c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Oct 28 23:49:17 2018 +0100 testbot: Detect if a task failed before starting the tests. This makes it possible to reliably report build issues as such. It also helps improve handling of build script and VM crashes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 2 +- testbot/bin/WineRunReconfig.pl | 2 +- testbot/bin/WineRunWineTest.pl | 36 +++++++++++++++++++----------------- testbot/bin/build/WineTest.pl | 19 +++++++++++++++---- testbot/lib/WineTestBot/LogUtils.pm | 7 ++++--- 5 files changed, 40 insertions(+), 26 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 21d2e8b..5a3a683 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -406,7 +406,7 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Build.log'\n"); if ($TA->GetFile("Build.log", "$TaskDir/log")) { - my $Result = ParseTaskLog("$TaskDir/log"); + my ($Result, $_Type) = ParseTaskLog("$TaskDir/log"); if ($Result eq "ok") { # We must have gotten the full log and the build did succeed. diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 02eee8c..e7e5573 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -388,7 +388,7 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Reconfig.log'\n"); if ($TA->GetFile("Reconfig.log", "$TaskDir/log")) { - my $Result = ParseTaskLog("$TaskDir/log"); + my ($Result, $_Type) = ParseTaskLog("$TaskDir/log"); if ($Result eq "ok") { # We must have gotten the full log and the build did succeed. diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index f47a024..5b6eb33 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -490,14 +490,9 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) if ($ErrMessage =~ /timed out waiting for the child process/) { $ErrMessage = "The task timed out\n"; - if ($Step->Type eq "build") - { - $NewStatus = "badbuild"; - } - else - { - $TaskFailures = 1; - } + # We don't know if the timeout was caused by the build or the tests. + # Until we get the task log assume it's the tests' fault. + $TaskFailures = 1; $TaskTimedOut = 1; } else @@ -511,30 +506,37 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Task.log'\n"); if ($TA->GetFile("Task.log", "$TaskDir/log")) { - my $Result = ParseTaskLog("$TaskDir/log"); + my ($Result, $Type) = ParseTaskLog("$TaskDir/log"); if ($Result eq "ok") { - # We must have gotten the full log and the build did succeed. - # So forget any prior error. + # We must have gotten the full log and the task completed successfully + # (with or without test failures). So clear any previous errors, including + # $TaskFailures since there was not really a timeout after all. $NewStatus = "completed"; - $TAError = $ErrMessage = undef; + $TaskFailures = $TAError = $ErrMessage = $PossibleCrash = undef; } elsif ($Result eq "badpatch") { # This too is conclusive enough to ignore other errors. $NewStatus = "badpatch"; - $TAError = $ErrMessage = undef; + $TaskFailures = $TAError = $ErrMessage = $PossibleCrash = undef; } elsif ($Result =~ s/^nolog://) { FatalError("$Result\n", "retry"); } - elsif ($Result ne "missing" or $Step->Type ne "suite") + elsif ($Type eq "build") { - # There is no build and thus no result line when running WineTest. - # Otherwise if the result line is missing we probably already have an - # error message that explains why. + # The error happened before the tests started so blame the build. $NewStatus = "badbuild"; + $TaskFailures = $PossibleCrash = undef; + } + elsif (!$TaskTimedOut and !defined $TAError) + { + # Did WineTest.pl crash? + $NewStatus = "boterror"; + $TaskFailures = undef; + $PossibleCrash = 1; } } elsif (!defined $TAError) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 32830b0..0b14b68 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -75,12 +75,24 @@ sub BuildWine($$) # Test helpers # +my $InTests; + +sub SetupTest($$) +{ + my ($Test, $Mission) = @_; + + LogMsg "tests\n" if (!$InTests); + $InTests = 1; + + InfoMsg "\n$Running $Test in the $Mission->{Build} Wine\n"; + SetupWineEnvironment($Mission->{Build}); +} + sub DailyWineTest($$$$) { my ($Mission, $NoSubmit, $BaseTag, $Args) = @_; - InfoMsg "\nRunning WineTest in the $Mission->{Build} Wine\n"; - SetupWineEnvironment($Mission->{Build}); + SetupTest("WineTest", $Mission); # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. @@ -128,8 +140,7 @@ sub TestPatch($$) } return 1 if (!@TestList); - InfoMsg "\nRunning the tests in the $Mission->{Build} Wine\n"; - SetupWineEnvironment($Mission->{Build}); + SetupTest("the tests", $Mission); # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 4751f75..59b2d0a 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -80,12 +80,13 @@ sub ParseTaskLog($) if (open(my $LogFile, "<", $FileName)) { my $Result; + my $Type = "build"; foreach my $Line (<$LogFile>) { chomp $Line; if ($Line eq "Task: tests") { - ; # Ignore it for now + $Type = "tests"; } elsif ($Line eq "Task: ok") { @@ -102,9 +103,9 @@ sub ParseTaskLog($) } } close($LogFile); - return $Result || "missing"; + return ($Result || "missing", $Type); } - return "nolog:Unable to open the task log for reading: $!"; + return ("nolog:Unable to open the task log for reading: $!", undef); }

1 0

Józef Kucia : vkd3d-shader: Avoid uint32_t in public interface.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: vkd3d Branch: master Commit: 34f61154f7bf6d2be6232495c9729b8017828b0c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=34f61154f7bf6d2be623249… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 29 11:12:18 2018 +0100 vkd3d-shader: Avoid uint32_t in public interface. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_shader.h | 10 ++++------ libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- programs/vkd3d-compiler/main.c | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/include/private/vkd3d_shader.h b/include/private/vkd3d_shader.h index bb137ba..e97e185 100644 --- a/include/private/vkd3d_shader.h +++ b/include/private/vkd3d_shader.h @@ -19,8 +19,6 @@ #ifndef __VKD3D_SHADER_H #define __VKD3D_SHADER_H -#include <stdint.h> - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -79,8 +77,8 @@ enum vkd3d_shader_descriptor_type struct vkd3d_shader_descriptor_binding { - uint32_t set; - uint32_t binding; + unsigned int set; + unsigned int binding; }; enum vkd3d_shader_binding_flag @@ -168,7 +166,7 @@ struct vkd3d_shader_compile_arguments }; int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_code *spirv, uint32_t compiler_options, + struct vkd3d_shader_code *spirv, unsigned int compiler_options, const struct vkd3d_shader_interface *shader_interface, const struct vkd3d_shader_compile_arguments *compile_args); void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); @@ -370,7 +368,7 @@ struct vkd3d_shader_scan_info { unsigned int uav_read_mask : VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS; unsigned int uav_counter_mask : VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS; - uint32_t sampler_comparison_mode_mask; + unsigned int sampler_comparison_mode_mask; }; int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 71410f1..f813208 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -75,7 +75,7 @@ static int vkd3d_shader_validate_compile_args(const struct vkd3d_shader_compile_ } int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_code *spirv, uint32_t compiler_options, + struct vkd3d_shader_code *spirv, unsigned int compiler_options, const struct vkd3d_shader_interface *shader_interface, const struct vkd3d_shader_compile_arguments *compile_args) { diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 5fe4540..b363435 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -107,7 +107,7 @@ struct options { const char *filename; const char *output_filename; - uint32_t compiler_options; + unsigned int compiler_options; }; static bool parse_command_line(int argc, char **argv, struct options *options)

1 0

Józef Kucia : vkd3d-shader: Introduce VKD3D_SHADER_VISIBILITY_COMPUTE.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: vkd3d Branch: master Commit: 0f0af935a6d6dd62fc6d261172f94292dde5c496 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0f0af935a6d6dd62fc6d261… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 29 11:12:17 2018 +0100 vkd3d-shader: Introduce VKD3D_SHADER_VISIBILITY_COMPUTE. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_shader.h | 2 ++ libs/vkd3d-shader/spirv.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/include/private/vkd3d_shader.h b/include/private/vkd3d_shader.h index d55ed9f..bb137ba 100644 --- a/include/private/vkd3d_shader.h +++ b/include/private/vkd3d_shader.h @@ -55,6 +55,8 @@ enum vkd3d_shader_visibility VKD3D_SHADER_VISIBILITY_GEOMETRY = 4, VKD3D_SHADER_VISIBILITY_PIXEL = 5, + VKD3D_SHADER_VISIBILITY_COMPUTE = 1000000000, + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_VISIBILITY), }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 79af890..09c6f9f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2000,6 +2000,8 @@ static bool vkd3d_dxbc_compiler_check_shader_visibility(const struct vkd3d_dxbc_ return compiler->shader_type == VKD3D_SHADER_TYPE_GEOMETRY; case VKD3D_SHADER_VISIBILITY_PIXEL: return compiler->shader_type == VKD3D_SHADER_TYPE_PIXEL; + case VKD3D_SHADER_VISIBILITY_COMPUTE: + return compiler->shader_type == VKD3D_SHADER_TYPE_COMPUTE; default: ERR("Invalid shader visibility %#x.\n", visibility); return false;

1 0

Józef Kucia : vkd3d-shader: Introduce vkd3d_shader_binding_flags.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: vkd3d Branch: master Commit: ae84b5210e58a9f49d93d6ad39f0df5ae4df4bd7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ae84b5210e58a9f49d93d6a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 29 11:12:16 2018 +0100 vkd3d-shader: Introduce vkd3d_shader_binding_flags. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_shader.h | 13 ++++++++++--- libs/vkd3d-shader/spirv.c | 23 ++++++++++++++++------- libs/vkd3d/state.c | 17 +++++++++-------- 3 files changed, 35 insertions(+), 18 deletions(-) diff --git a/include/private/vkd3d_shader.h b/include/private/vkd3d_shader.h index b9472a2..d55ed9f 100644 --- a/include/private/vkd3d_shader.h +++ b/include/private/vkd3d_shader.h @@ -19,7 +19,6 @@ #ifndef __VKD3D_SHADER_H #define __VKD3D_SHADER_H -#include <stdbool.h> #include <stdint.h> #ifdef __cplusplus @@ -82,12 +81,20 @@ struct vkd3d_shader_descriptor_binding uint32_t binding; }; +enum vkd3d_shader_binding_flag +{ + VKD3D_SHADER_BINDING_FLAG_BUFFER = 0x00000001, + VKD3D_SHADER_BINDING_FLAG_IMAGE = 0x00000002, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_BINDING_FLAG), +}; + struct vkd3d_shader_resource_binding { enum vkd3d_shader_descriptor_type type; unsigned int register_index; enum vkd3d_shader_visibility shader_visibility; - bool is_buffer; + unsigned int flags; /* vkd3d_shader_binding_flags */ struct vkd3d_shader_descriptor_binding binding; }; @@ -99,7 +106,7 @@ struct vkd3d_shader_combined_resource_sampler unsigned int resource_index; unsigned int sampler_index; enum vkd3d_shader_visibility shader_visibility; - bool is_buffer; + unsigned int flags; /* vkd3d_shader_binding_flags */ struct vkd3d_shader_descriptor_binding binding; }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d281d25..79af890 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2057,9 +2057,9 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor { const struct vkd3d_shader_interface *shader_interface = &compiler->shader_interface; enum vkd3d_shader_descriptor_type descriptor_type; + enum vkd3d_shader_binding_flag resource_type_flag; struct vkd3d_shader_descriptor_binding binding; unsigned int reg_idx = reg->idx[0].offset; - bool is_buffer_resource; unsigned int i; descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_UNKNOWN; @@ -2074,7 +2074,9 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor else FIXME("Unhandled register type %#x.\n", reg->type); - is_buffer_resource = resource_type == VKD3D_SHADER_RESOURCE_BUFFER; + resource_type_flag = resource_type == VKD3D_SHADER_RESOURCE_BUFFER + ? VKD3D_SHADER_BINDING_FLAG_BUFFER : VKD3D_SHADER_BINDING_FLAG_IMAGE; + if (is_uav_counter) { assert(descriptor_type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV); @@ -2098,11 +2100,13 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor { const struct vkd3d_shader_resource_binding *current = &shader_interface->bindings[i]; + if (!(current->flags & resource_type_flag)) + continue; + if (!vkd3d_dxbc_compiler_check_shader_visibility(compiler, current->shader_visibility)) continue; - if (current->type == descriptor_type && current->register_index == reg_idx - && current->is_buffer == is_buffer_resource) + if (current->type == descriptor_type && current->register_index == reg_idx) return current->binding; } if (shader_interface->binding_count) @@ -3908,17 +3912,22 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ const struct vkd3d_shader_combined_resource_sampler *current; const unsigned int resource_index = resource->idx[0].offset; uint32_t image_type_id, type_id, ptr_type_id, var_id; - bool is_buffer_resource, depth; + enum vkd3d_shader_binding_flag resource_type_flag; struct vkd3d_symbol symbol; unsigned int i; + bool depth; - is_buffer_resource = resource_type == VKD3D_SHADER_RESOURCE_BUFFER; + resource_type_flag = resource_type == VKD3D_SHADER_RESOURCE_BUFFER + ? VKD3D_SHADER_BINDING_FLAG_BUFFER : VKD3D_SHADER_BINDING_FLAG_IMAGE; for (i = 0; i < shader_interface->combined_sampler_count; ++i) { current = &shader_interface->combined_samplers[i]; - if (current->resource_index != resource_index || current->is_buffer != is_buffer_resource) + if (current->resource_index != resource_index) + continue; + + if (!(current->flags & resource_type_flag)) continue; if (!vkd3d_dxbc_compiler_check_shader_visibility(compiler, current->shader_visibility)) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 7e0b1ee..4800ff3 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -607,14 +607,15 @@ static void d3d12_root_signature_append_vk_binding(struct d3d12_root_signature * bool buffer_descriptor, enum vkd3d_shader_visibility shader_visibility, struct vkd3d_descriptor_set_context *context) { - unsigned int i = context->descriptor_index++; - - root_signature->descriptor_mapping[i].type = descriptor_type; - root_signature->descriptor_mapping[i].register_index = register_idx; - root_signature->descriptor_mapping[i].shader_visibility = shader_visibility; - root_signature->descriptor_mapping[i].is_buffer = buffer_descriptor; - root_signature->descriptor_mapping[i].binding.set = context->set_index; - root_signature->descriptor_mapping[i].binding.binding = context->descriptor_binding++; + struct vkd3d_shader_resource_binding *mapping + = &root_signature->descriptor_mapping[context->descriptor_index++]; + + mapping->type = descriptor_type; + mapping->register_index = register_idx; + mapping->shader_visibility = shader_visibility; + mapping->flags = buffer_descriptor ? VKD3D_SHADER_BINDING_FLAG_BUFFER : VKD3D_SHADER_BINDING_FLAG_IMAGE; + mapping->binding.set = context->set_index; + mapping->binding.binding = context->descriptor_binding++; } static uint32_t d3d12_root_signature_assign_vk_bindings(struct d3d12_root_signature *root_signature,

1 0

Józef Kucia : vkd3d-shader: Use typed shader inputs directly.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: vkd3d Branch: master Commit: feeb2b49dfbce9cf87c1c0fed7caf827203c1f4e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=feeb2b49dfbce9cf87c1c0f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 29 11:12:15 2018 +0100 vkd3d-shader: Use typed shader inputs directly. ... instead of copying them to a private floating-point variable. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 13631a0..d281d25 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3238,7 +3238,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationComponent, component_idx); } - use_private_var = component_type != VKD3D_TYPE_FLOAT || component_count != VKD3D_VEC4_SIZE; + use_private_var = component_count != VKD3D_VEC4_SIZE || (builtin && builtin->fixup_pfn); vkd3d_symbol_make_register(&reg_symbol, reg); @@ -3256,7 +3256,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi { reg_symbol.id = var_id; reg_symbol.info.reg.storage_class = storage_class; - reg_symbol.info.reg.component_type = VKD3D_TYPE_FLOAT; + reg_symbol.info.reg.component_type = use_private_var ? VKD3D_TYPE_FLOAT : component_type; reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol);

1 0

Józef Kucia : build: Check VK_HEADER_VERSION.
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: vkd3d Branch: master Commit: 93676365b74b7914ede90183be90648116f8a5ed URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=93676365b74b7914ede9018… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 29 11:12:14 2018 +0100 build: Check VK_HEADER_VERSION. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 2 ++ m4/vulkan.m4 | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/configure.ac b/configure.ac index 58672c5..8c82741 100644 --- a/configure.ac +++ b/configure.ac @@ -61,6 +61,8 @@ AS_IF([test "x$ac_cv_header_spirv_unified1_GLSL_std_450_h" != "xyes" \ -a "x$ac_cv_header_vulkan_GLSL_std_450_h" != "xyes"], [AC_MSG_ERROR([GLSL.std.450.h not found.])]) +VKD3D_CHECK_VULKAN_HEADER_VERSION([84], [AC_MSG_ERROR([Vulkan headers are too old, 1.1.84 is required.])]) + dnl Check for libraries m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG], [m4_fatal([pkg-config autoconf macros not found.])]) diff --git a/m4/vulkan.m4 b/m4/vulkan.m4 new file mode 100644 index 0000000..6ef5818 --- /dev/null +++ b/m4/vulkan.m4 @@ -0,0 +1,18 @@ +dnl VKD3D_CHECK_VULKAN_HEADER_VERSION +AC_DEFUN([VKD3D_CHECK_VULKAN_HEADER_VERSION], + +[AS_VAR_PUSHDEF([vkd3d_vk_version], vkd3d_cv_vk_header_version_[[$1]]) + +AC_CACHE_CHECK([whether VK_HEADER_VERSION >= [$1]], vkd3d_vk_version, + [AC_LINK_IFELSE( + [AC_LANG_SOURCE([#include <vulkan/vulkan.h> + #if VK_HEADER_VERSION < $1 + #error "Vulkan headers are too old" + #endif + int main(void) { return 0; }])], + [AS_VAR_SET([vkd3d_vk_version], [yes])], + [AS_VAR_SET([vkd3d_vk_version], [no])])]) + +AS_IF([test "x$vkd3d_vk_version" != "xyes"], [$2]) + +AS_VAR_POPDEF([vkd3d_vk_version])])

1 0

Józef Kucia : vkd3d: Avoid division by zero in GetResourceAllocationInfo() (Coverity).
by Alexandre Julliard 29 Oct '18

29 Oct '18

Module: vkd3d Branch: master Commit: a08dadde32fb5af11d006113a04bf5bf09c7b99b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a08dadde32fb5af11d00611… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 29 11:12:13 2018 +0100 vkd3d: Avoid division by zero in GetResourceAllocationInfo() (Coverity). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 4f5cdd6..e41a309 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2072,7 +2072,7 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour } } - if (desc->Alignment % info->Alignment) + if (valid && desc->Alignment % info->Alignment) { WARN("Invalid resource alignment %#"PRIx64" (required %#"PRIx64").\n", desc->Alignment, info->Alignment);

1 0

Alexandre Julliard : Wine release 3.19
by Alexandre Julliard 26 Oct '18

26 Oct '18

Module: website Branch: master Commit: e75498f55f4fe789dd9d40193bf420ca5bbfb786 URL: https://source.winehq.org/git/website.git/?a=commit;h=e75498f55f4fe789dd9d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 26 21:24:12 2018 +0200 Wine release 3.19 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018102601.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2018102601.xml b/news/en/2018102601.xml new file mode 100644 index 0000000..3b116fc --- /dev/null +++ b/news/en/2018102601.xml @@ -0,0 +1,16 @@ +<news> +<date>October 26, 2018</date> +<title>Wine 3.19 Released</title> +<body> + The Wine development release 3.19 is now available. + <a href="{$root}/announce/3.19">What's new</a> in this release: +<ul> + <li>Support for file I/O completion modes.</li> + <li>WaitOnAddress synchronization primitives.</li> + <li>Better support for 32-bit .NET binaries on 64-bit.</li> + <li>Improved recovery on broken RPC connection.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.19.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
61
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 October 2018