May 2021 - Wine-commits - list.winehq.org

Francois Gouget : winetest/build-patterns: Use while to read from file descriptors.
by Alexandre Julliard 17 May '21

17 May '21

Module: tools Branch: master Commit: dfffdd720f2a786c5b61d67b8bc06527b75f6a8c URL: https://source.winehq.org/git/tools.git/?a=commit;h=dfffdd720f2a786c5b61d67… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 17 10:23:10 2021 +0200 winetest/build-patterns: Use while to read from file descriptors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 06d527f..e6bdf97 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -674,7 +674,7 @@ if (open(my $fh, "-|", $cmd)) { my $index = 0; my ($commit, $build); - foreach my $line (<$fh>) + while (my $line = <$fh>) { chomp $line; if ($line =~ /^([0-9a-f]{40}) (.*)$/)

1 0

Francois Gouget : winetest/build-patterns: Fix the new failure modes description.
by Alexandre Julliard 17 May '21

17 May '21

Module: tools Branch: master Commit: 37ed8690566aebf40867216d9f37c7937eff6c23 URL: https://source.winehq.org/git/tools.git/?a=commit;h=37ed8690566aebf40867216… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 17 10:23:56 2021 +0200 winetest/build-patterns: Fix the new failure modes description. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index e6bdf97..de00461 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -1256,7 +1256,7 @@ EOF <li>Lines with a _N suffix are when WineTest was run more than once for a test configuration + build combination. They are rare and thus hang at the bottom of the pattern to not disrupt it.</li> <li>Each cell is a single letter describing the result for that test. See the tooltips for a description. Click on the letter to go to that result page.</li> <li>Each result is also color coded to make the patterns pop out. There is one color per type of result (crash , timeout, etc.), and one per number of failures (to help detect changes).</li> - <li>Failure modes that have not been seen before (test that newly crashes, new failure count, etc.) are highlighted, as well as the configuration names in which it appears.</li> + <li>Failure modes that have not been seen before (test that newly crashes, new failure count, etc.) are highlighted, as well as the configuration names in which they appear.</li> <li>Below the patterns is a line showing which builds have potentially related commits if any. </ul>

1 0

Francois Gouget : winetest/build-patterns: Add links to the related bugs.
by Alexandre Julliard 17 May '21

17 May '21

Module: tools Branch: master Commit: 61d6ba6bb861ee650e5db62a943a1393ff503bb3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=61d6ba6bb861ee650e5db62… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 17 10:24:00 2021 +0200 winetest/build-patterns: Add links to the related bugs. Query Wine's bugzilla to identify the bugs related to a given test unit, show basic information about them and link to them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 86 ++++++++++++++++++++++++++++++++++++++++++++++++- winetest/report.css | 10 ++++++ winetest/winetest.conf | 2 ++ 3 files changed, 97 insertions(+), 1 deletion(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index de00461..3c9b8aa 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -21,6 +21,9 @@ use warnings; use open ':utf8'; use CGI qw(:standard); +use Text::CSV::Encoded; +use Time::Piece; + sub BEGIN { if ($0 !~ m=^/=) @@ -31,7 +34,7 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$workdir $gitdir $gitweb @groups $patternbuilds $fixed_threshold/; +use vars qw/$workdir $bugweb $gitdir $gitweb @groups $patternbuilds $fixed_threshold/; require "winetest.conf"; my $name0=$0; @@ -745,6 +748,85 @@ if (open(my $fh, "-|", $cmd)) } +# +# Collect the related bugs +# + +# A hashtable of bugs indexed by their id. +# Each object has the following fields: +# +# - id +# The bug unique identifier. +# +# - mtime +# The bug's last modification timestamp. +# +# - class +# The CSS class used for presenting the bug. +# +# - desc +# The bug's one-line description. +my %bugs; + +my $old_build_date = $sortedbuilds[0]->{date}; +my $mid_build_date = $sortedbuilds[int(@sortedbuilds/2)]->{date}; + +sub create_bug($$$) +{ + my ($bugid, $mtime, $desc) = @_; + + my $t = Time::Piece->strptime($mtime, "%Y-%m-%d %H:%M:%S"); + return { + id => $bugid, + mtime => $t->epoch, + class => $t < $old_build_date ? "bugold" : + $t < $mid_build_date ? "buginactive" : "bugactive", + desc => $desc, + }; +} + +$cmd = "wget -qO- '$bugweb/buglist.cgi?product=Wine&product=Wine-Testbot&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&keywords=source%2Ctestcase&keywords_type=allwords&rep_platform=x86&rep_platform=x86-64&columnlist=changeddate%2Cshort_desc&query_format=advanced&ctype=csv'"; +if (open(my $fh, "-|", $cmd)) +{ + <$fh>; # skip the header line + + my $csv = Text::CSV::Encoded->new({ binary => 1 }); + while (my $line = <$fh>) + { + if (!$csv->parse($line)) + { + error("could not parse line: ", $csv->error_input, "\n"); + next; + } + + my ($bugid, $mtime, $desc) = $csv->fields(); + my $teststr = $desc; + while ($teststr =~ s~\b([_.a-z0-9-]+)(?:/tests/|/|:)([_a-z0-9]+)\b~ ~) + { + my ($module, $unit) = ($1, $2); + my $test = $tests{"$module:$unit"}; + next if (!$test); + $bugs{$bugid} ||= create_bug($bugid, $mtime, $desc); + push @{$test->{bugs}}, $bugs{$bugid}; + } + } + close($fh); + + # Put the list of related bugs in the test's desc field + foreach my $test (values %tests) + { + next if (!$test->{bugs}); + $test->{desc} = "Related bugs: "; + foreach my $bug (sort { $a->{mtime} <=> $b->{mtime} } @{$test->{bugs}}) + { + $test->{desc} .= "<a href='$bugweb/show_bug.cgi?id=$bug->{id}'>$bug->{id}</a> {class}'>$bug->{desc}"; + $test->{desc} .= " "; + } + $test->{desc} .= ""; + } +} + + # # Compute color gradients # @@ -1258,6 +1340,8 @@ EOF <li>Each result is also color coded to make the patterns pop out. There is one color per type of result (crash , timeout, etc.), and one per number of failures (to help detect changes).</li> <li>Failure modes that have not been seen before (test that newly crashes, new failure count, etc.) are highlighted, as well as the configuration names in which they appear.</li> <li>Below the patterns is a line showing which builds have potentially related commits if any. + <li>Bugs related to a test are shown above the pattern. New (and recently modified) bugs are highlighted. Slightly older bugs are also highlighted as a reminder to investigate them while the pattern may still contain traces of their inception.</li> + <li>Related bugs should have the source and testcase keywords, and their description should contain module:unit, module/unit or module/tests/unit. </ul> The patterns are grouped according to the likelyhood that they contain new failures: diff --git a/winetest/report.css b/winetest/report.css index f789808..05ee035 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -126,3 +126,13 @@ div.pattern :hover { color: black; text-decoration: underline; } .commitm { font-style: italic; } + +/* .bugold */ +.buginactive { + color: #cc0000; + font-weight: bold; +} +.bugactive { + color: #000066; + font-weight: bold; +} diff --git a/winetest/winetest.conf b/winetest/winetest.conf index 3041cf7..5ac2261 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -2,6 +2,8 @@ $workdir = "/home/winehq/opt/winetest"; +$bugweb = "https://bugs.winehq.org/"; + $gitdir = "/home/winehq/opt/source/git/wine.git"; $gitweb = "//source.winehq.org/git/wine.git";

1 0

Zhenbo Li : OSPP Summer 2021.
by Alexandre Julliard 17 May '21

17 May '21

Module: website Branch: master Commit: 21455531cfcabed2c0dafdee64c5ba8bbfd12b37 URL: https://source.winehq.org/git/website.git/?a=commit;h=21455531cfcabed2c0daf… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sun May 16 16:09:55 2021 +0800 OSPP Summer 2021. Signed-off-by: Zhenbo Li <litimetal(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021051601.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/news/en/2021051601.xml b/news/en/2021051601.xml new file mode 100644 index 00000000..0c00b1b9 --- /dev/null +++ b/news/en/2021051601.xml @@ -0,0 +1,9 @@ +<news> +<date>May 16, 2021</date> +<title>Participating in OSPP Summer 2021</title> +<body> + The Wine Project is selected as a community of <a href="https://summer.iscas.ac.cn/#/?lang=en">OSPP Summer 2021</a>. +This is our first time participating in this event. All students who are interested in Wine are welcome! Please have a look for potential proposals you might be interested in: <a href="https://wiki.winehq.org/Ospp_Summer_Code">https://wiki.winehq.org/Ospp_Summer_Code</a>. It's great if you have your own idea. Please don't hesitate to post it on the wine-devel mailing list. +The student proposal deadline is June 12th, UTC. +See the <a href="https://summer.iscas.ac.cn/help/en/">OSPP Summer FAQ</a> for more details. +</body></news>

1 0

Francois Gouget : urlmon/tests: Fix the spelling of a comment.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 04cf91ed1dbda1212bd078d192ab7116078b051a URL: https://source.winehq.org/git/wine.git/?a=commit;h=04cf91ed1dbda1212bd078d1… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 14 17:12:27 2021 +0200 urlmon/tests: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 2142e4a79e7..eb58bb54550 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1569,7 +1569,7 @@ static void test_user_agent(void) todo_wine #endif /* This assumes that either p points at some property before - * '; .NET', or that there is more than one such occurence. + * '; .NET', or that there is more than one such occurrence. */ ok(strstr(p, "; .NET") != NULL, "no '; .NET' in %s\n", wine_dbgstr_a(p)); p = strchr(p, ')');

1 0

Piotr Caban : include: Fix denormals handling in _fpclassf inline implementation.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 522e13e6825f9dd50ddb7ddc079f0abf5dfd1034 URL: https://source.winehq.org/git/wine.git/?a=commit;h=522e13e6825f9dd50ddb7ddc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 13 21:15:20 2021 +0200 include: Fix denormals handling in _fpclassf inline implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/math.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index 43e82fc3bea..d2977b67c34 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -166,7 +166,20 @@ static inline float fmodf(float x, float y) { return fmod(x, y); } static inline int _finitef(float x) { return _finite(x); } static inline int _isnanf(float x) { return _isnan(x); } -static inline int _fpclassf(float x) { return _fpclass(x); } + +static inline int _fpclassf(float x) +{ + unsigned int ix = *(int*)&x; + double d = x; + + /* construct denormal double */ + if (!(ix >> 23 & 0xff) && (ix << 1)) + { + unsigned __int64 id = (((unsigned __int64)ix >> 31) << 63) | 1; + d = *(double*)&id; + } + return _fpclass(d); +} #endif

1 0

Paul Gofman : kernel32/tests: Use sizeof(STARTUPINFOEX) for STARTUPINFOEX.STARTUPINFO.cb in process tests.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 45a48b5a84a138028c9fa709676e2258f0a01dbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=45a48b5a84a138028c9fa709… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 13 23:08:00 2021 +0300 kernel32/tests: Use sizeof(STARTUPINFOEX) for STARTUPINFOEX.STARTUPINFO.cb in process tests. Fixes some test failures on a few Testbot machines when the process attributes are just ignored. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index f960efb05a8..7d5d2ead75b 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -4073,7 +4073,7 @@ static void test_parent_process_attribute(unsigned int level, HANDLE read_pipe) } memset(&si, 0, sizeof(si)); - si.StartupInfo.cb = sizeof(si.StartupInfo); + si.StartupInfo.cb = sizeof(si); if (level) { @@ -4221,7 +4221,7 @@ static void test_handle_list_attribute(BOOL child, HANDLE handle1, HANDLE handle "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); memset(&si, 0, sizeof(si)); - si.StartupInfo.cb = sizeof(si.StartupInfo); + si.StartupInfo.cb = sizeof(si); si.lpAttributeList = heap_alloc(size); ret = pInitializeProcThreadAttributeList(si.lpAttributeList, 1, 0, &size); ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError());

1 0

Derek Lesho : winevulkan: Add support for unwrapping handles in thunks.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: fb8ab5e9d079474e07d753341393c0c1bfe32ddd URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb8ab5e9d079474e07d75334… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu May 13 12:18:44 2021 -0400 winevulkan: Add support for unwrapping handles in thunks. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 633 +++++++++++++++++++++++++++++++--------- dlls/winevulkan/vulkan.c | 57 +--- dlls/winevulkan/vulkan_thunks.c | 453 +++++++++++++++++++++++++++- dlls/winevulkan/vulkan_thunks.h | 38 ++- 4 files changed, 973 insertions(+), 208 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fb8ab5e9d079474e07d7…

1 0

Derek Lesho : winevulkan: Use automatically-generated thunk for vkCmdExecuteCommands.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 8f2f1f83c38c5792aac4105624ff60a313e95ef2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f2f1f83c38c5792aac41056… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu May 13 12:18:45 2021 -0400 winevulkan: Use automatically-generated thunk for vkCmdExecuteCommands. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 - dlls/winevulkan/vulkan.c | 30 ------------------------------ dlls/winevulkan/vulkan_thunks.c | 34 ++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 1 - 4 files changed, 34 insertions(+), 32 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 7abe2740a6d..3f2f4a20748 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -185,7 +185,6 @@ FUNCTION_OVERRIDES = { # Device functions "vkAllocateCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, - "vkCmdExecuteCommands" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, "vkCreateCommandPool" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, "vkDestroyCommandPool" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, "vkDestroyDevice" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 69440c7a374..8f6c0ba9a2c 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -684,36 +684,6 @@ VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, return res; } -void WINAPI wine_vkCmdExecuteCommands(VkCommandBuffer buffer, uint32_t count, - const VkCommandBuffer *buffers) -{ - VkCommandBuffer *tmp_buffers; - unsigned int i; - - TRACE("%p %u %p\n", buffer, count, buffers); - - if (!buffers || !count) - return; - - /* Unfortunately we need a temporary buffer as our command buffers are wrapped. - * This call is called often and if a performance concern, we may want to use - * alloca as we shouldn't need much memory and it needs to be cleaned up after - * the call anyway. - */ - if (!(tmp_buffers = malloc(count * sizeof(*tmp_buffers)))) - { - ERR("Failed to allocate memory for temporary command buffers\n"); - return; - } - - for (i = 0; i < count; i++) - tmp_buffers[i] = buffers[i]->command_buffer; - - buffer->device->funcs.p_vkCmdExecuteCommands(buffer->command_buffer, count, tmp_buffers); - - free(tmp_buffers); -} - VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, const VkDeviceCreateInfo *create_info, const VkAllocationCallbacks *allocator, VkDevice *device) diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index e92fffe9cf3..e2a8764538e 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -668,6 +668,29 @@ static inline void convert_VkCuLaunchInfoNVX_win_to_host(const VkCuLaunchInfoNVX } #endif /* USE_STRUCT_CONVERSION */ +static inline VkCommandBuffer *convert_VkCommandBuffer_array_win_to_host(const VkCommandBuffer *in, uint32_t count) +{ + VkCommandBuffer *out; + unsigned int i; + + if (!in) return NULL; + + out = malloc(count * sizeof(*out)); + for (i = 0; i < count; i++) + { + out[i] = in[i]->command_buffer; + } + + return out; +} + +static inline void free_VkCommandBuffer_array(VkCommandBuffer *in, uint32_t count) +{ + if (!in) return; + + free(in); +} + #if defined(USE_STRUCT_CONVERSION) static inline VkIndirectCommandsStreamNV_host *convert_VkIndirectCommandsStreamNV_array_win_to_host(const VkIndirectCommandsStreamNV *in, uint32_t count) { @@ -5114,6 +5137,17 @@ static void WINAPI wine_vkCmdEndTransformFeedbackEXT(VkCommandBuffer commandBuff commandBuffer->device->funcs.p_vkCmdEndTransformFeedbackEXT(commandBuffer->command_buffer, firstCounterBuffer, counterBufferCount, pCounterBuffers, pCounterBufferOffsets); } +void WINAPI wine_vkCmdExecuteCommands(VkCommandBuffer commandBuffer, uint32_t commandBufferCount, const VkCommandBuffer *pCommandBuffers) +{ + VkCommandBuffer *pCommandBuffers_host; + TRACE("%p, %u, %p\n", commandBuffer, commandBufferCount, pCommandBuffers); + + pCommandBuffers_host = convert_VkCommandBuffer_array_win_to_host(pCommandBuffers, commandBufferCount); + commandBuffer->device->funcs.p_vkCmdExecuteCommands(commandBuffer->command_buffer, commandBufferCount, pCommandBuffers_host); + + free_VkCommandBuffer_array(pCommandBuffers_host, commandBufferCount); +} + static void WINAPI wine_vkCmdExecuteGeneratedCommandsNV(VkCommandBuffer commandBuffer, VkBool32 isPreprocessed, const VkGeneratedCommandsInfoNV *pGeneratedCommandsInfo) { #if defined(USE_STRUCT_CONVERSION) diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 488f559797e..bfa392021df 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -16,7 +16,6 @@ /* Functions for which we have custom implementations outside of the thunks. */ VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferAllocateInfo *pAllocateInfo, VkCommandBuffer *pCommandBuffers); -void WINAPI wine_vkCmdExecuteCommands(VkCommandBuffer commandBuffer, uint32_t commandBufferCount, const VkCommandBuffer *pCommandBuffers); VkResult WINAPI wine_vkCreateCommandPool(VkDevice device, const VkCommandPoolCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkCommandPool *pCommandPool); VkResult WINAPI wine_vkCreateDebugReportCallbackEXT(VkInstance instance, const VkDebugReportCallbackCreateInfoEXT *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDebugReportCallbackEXT *pCallback) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkCreateDebugUtilsMessengerEXT(VkInstance instance, const VkDebugUtilsMessengerCreateInfoEXT *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDebugUtilsMessengerEXT *pMessenger) DECLSPEC_HIDDEN;

1 0

Derek Lesho : winevulkan: Use automatically-generated thunk for vkQueueSubmit.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 961d611baf0bfe0dd087aebb1d7efad2e98a6f0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=961d611baf0bfe0dd087aebb… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu May 13 12:18:46 2021 -0400 winevulkan: Use automatically-generated thunk for vkQueueSubmit. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 - dlls/winevulkan/vulkan.c | 55 ----------------------------------------- dlls/winevulkan/vulkan_thunks.c | 50 +++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 1 - 4 files changed, 50 insertions(+), 57 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 3f2f4a20748..cc79b0a58cd 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -192,7 +192,6 @@ FUNCTION_OVERRIDES = { "vkGetDeviceProcAddr" : {"dispatch" : False, "driver" : True, "thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.NONE}, "vkGetDeviceQueue" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, "vkGetDeviceQueue2" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, - "vkQueueSubmit" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, # VK_KHR_surface "vkDestroySurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.NONE}, diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 8f6c0ba9a2c..9f181d92bc5 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1067,61 +1067,6 @@ void WINAPI wine_vkGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *in *queue = wine_vk_device_find_queue(device, info); } -VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t count, - const VkSubmitInfo *submits, VkFence fence) -{ - VkSubmitInfo *submits_host; - VkResult res; - VkCommandBuffer *command_buffers; - unsigned int i, j, num_command_buffers; - - TRACE("%p %u %p 0x%s\n", queue, count, submits, wine_dbgstr_longlong(fence)); - - if (count == 0) - { - return queue->device->funcs.p_vkQueueSubmit(queue->queue, 0, NULL, fence); - } - - submits_host = calloc(count, sizeof(*submits_host)); - if (!submits_host) - { - ERR("Unable to allocate memory for submit buffers!\n"); - return VK_ERROR_OUT_OF_HOST_MEMORY; - } - - for (i = 0; i < count; i++) - { - memcpy(&submits_host[i], &submits[i], sizeof(*submits_host)); - - num_command_buffers = submits[i].commandBufferCount; - command_buffers = calloc(num_command_buffers, sizeof(*command_buffers)); - if (!command_buffers) - { - ERR("Unable to allocate memory for command buffers!\n"); - res = VK_ERROR_OUT_OF_HOST_MEMORY; - goto done; - } - - for (j = 0; j < num_command_buffers; j++) - { - command_buffers[j] = submits[i].pCommandBuffers[j]->command_buffer; - } - submits_host[i].pCommandBuffers = command_buffers; - } - - res = queue->device->funcs.p_vkQueueSubmit(queue->queue, count, submits_host, fence); - -done: - for (i = 0; i < count; i++) - { - free((void *)submits_host[i].pCommandBuffers); - } - free(submits_host); - - TRACE("Returning %d\n", res); - return res; -} - VkResult WINAPI wine_vkCreateCommandPool(VkDevice device, const VkCommandPoolCreateInfo *info, const VkAllocationCallbacks *allocator, VkCommandPool *command_pool) { diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index e2a8764538e..c0dbbe2b8b8 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -2317,6 +2317,43 @@ static inline void free_VkBindSparseInfo_array(VkBindSparseInfo_host *in, uint32 } #endif /* USE_STRUCT_CONVERSION */ +static inline VkSubmitInfo *convert_VkSubmitInfo_array_win_to_host(const VkSubmitInfo *in, uint32_t count) +{ + VkSubmitInfo *out; + unsigned int i; + + if (!in) return NULL; + + out = malloc(count * sizeof(*out)); + for (i = 0; i < count; i++) + { + out[i].sType = in[i].sType; + out[i].pNext = in[i].pNext; + out[i].waitSemaphoreCount = in[i].waitSemaphoreCount; + out[i].pWaitSemaphores = in[i].pWaitSemaphores; + out[i].pWaitDstStageMask = in[i].pWaitDstStageMask; + out[i].commandBufferCount = in[i].commandBufferCount; + out[i].pCommandBuffers = convert_VkCommandBuffer_array_win_to_host(in[i].pCommandBuffers, in[i].commandBufferCount); + out[i].signalSemaphoreCount = in[i].signalSemaphoreCount; + out[i].pSignalSemaphores = in[i].pSignalSemaphores; + } + + return out; +} + +static inline void free_VkSubmitInfo_array(VkSubmitInfo *in, uint32_t count) +{ + unsigned int i; + + if (!in) return; + + for (i = 0; i < count; i++) + { + free_VkCommandBuffer_array((VkCommandBuffer *)in[i].pCommandBuffers, in[i].commandBufferCount); + } + free(in); +} + #if defined(USE_STRUCT_CONVERSION) static inline VkSemaphoreSubmitInfoKHR_host *convert_VkSemaphoreSubmitInfoKHR_array_win_to_host(const VkSemaphoreSubmitInfoKHR *in, uint32_t count) { @@ -7462,6 +7499,19 @@ static VkResult WINAPI wine_vkQueueSetPerformanceConfigurationINTEL(VkQueue queu return queue->device->funcs.p_vkQueueSetPerformanceConfigurationINTEL(queue->queue, configuration); } +VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t submitCount, const VkSubmitInfo *pSubmits, VkFence fence) +{ + VkResult result; + VkSubmitInfo *pSubmits_host; + TRACE("%p, %u, %p, 0x%s\n", queue, submitCount, pSubmits, wine_dbgstr_longlong(fence)); + + pSubmits_host = convert_VkSubmitInfo_array_win_to_host(pSubmits, submitCount); + result = queue->device->funcs.p_vkQueueSubmit(queue->queue, submitCount, pSubmits_host, fence); + + free_VkSubmitInfo_array(pSubmits_host, submitCount); + return result; +} + static VkResult WINAPI wine_vkQueueSubmit2KHR(VkQueue queue, uint32_t submitCount, const VkSubmitInfo2KHR *pSubmits, VkFence fence) { #if defined(USE_STRUCT_CONVERSION) diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index bfa392021df..34442762859 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -57,7 +57,6 @@ VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevi VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities); VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities); void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t *pData) DECLSPEC_HIDDEN; -VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t submitCount, const VkSubmitInfo *pSubmits, VkFence fence); VkResult WINAPI wine_vkSetDebugUtilsObjectNameEXT(VkDevice device, const VkDebugUtilsObjectNameInfoEXT *pNameInfo) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkSetDebugUtilsObjectTagEXT(VkDevice device, const VkDebugUtilsObjectTagInfoEXT *pTagInfo) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkSetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t data) DECLSPEC_HIDDEN;

1 0