October 2019 - Wine-Commits

Hans-Kristian Arntzen : vkd3d: Fix stray semicolon in vulkan_procs.h.
by Alexandre Julliard Oct. 1, 2019

Oct. 1, 2019

Module: vkd3d Branch: master Commit: aa007299c45f3d7ec301f5bd2ff3c1034be410ac URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=aa007299c45f3d7ec301f5b… Author: Hans-Kristian Arntzen <post(a)arntzen-software.no> Date: Tue Oct 1 12:33:43 2019 +0200 vkd3d: Fix stray semicolon in vulkan_procs.h. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/vulkan_procs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/vulkan_procs.h b/libs/vkd3d/vulkan_procs.h index 702cfd2..ec29eb4 100644 --- a/libs/vkd3d/vulkan_procs.h +++ b/libs/vkd3d/vulkan_procs.h @@ -178,8 +178,8 @@ VK_DEVICE_PFN(vkUpdateDescriptorSets) VK_DEVICE_PFN(vkWaitForFences) /* VK_KHR_draw_indirect_count */ -VK_DEVICE_EXT_PFN(vkCmdDrawIndirectCountKHR); -VK_DEVICE_EXT_PFN(vkCmdDrawIndexedIndirectCountKHR); +VK_DEVICE_EXT_PFN(vkCmdDrawIndirectCountKHR) +VK_DEVICE_EXT_PFN(vkCmdDrawIndexedIndirectCountKHR) /* VK_KHR_get_memory_requirements2 */ VK_DEVICE_EXT_PFN(vkGetBufferMemoryRequirements2KHR)

1 0

Hans-Kristian Arntzen : vkd3d: Fix use of non-standard vararg macros.
by Alexandre Julliard Oct. 1, 2019

Oct. 1, 2019

Module: vkd3d Branch: master Commit: 50bd2db618cdc3de79e3e5fa3fd686441514108d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=50bd2db618cdc3de79e3e5f… Author: Hans-Kristian Arntzen <post(a)arntzen-software.no> Date: Tue Oct 1 12:33:44 2019 +0200 vkd3d: Fix use of non-standard vararg macros. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_debug.h | 4 ++-- include/private/vkd3d_test.h | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index 1a44cb9..c37c841 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -67,8 +67,8 @@ const char *debugstr_w(const WCHAR *wstr, size_t wchar_size) DECLSPEC_HIDDEN; vkd3d_dbg_next_time = true; \ VKD3D_DBG_PRINTF -#define VKD3D_DBG_PRINTF(args...) \ - vkd3d_dbg_printf(vkd3d_dbg_level, __FUNCTION__, args); } while (0) +#define VKD3D_DBG_PRINTF(...) \ + vkd3d_dbg_printf(vkd3d_dbg_level, __FUNCTION__, __VA_ARGS__); } while (0) #ifndef TRACE #define TRACE VKD3D_DBG_LOG(TRACE) diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index 319bf5d..6b8763d 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -57,40 +57,40 @@ static void vkd3d_test_end_todo(void); unsigned int vkd3d_line = line; \ VKD3D_TEST_ASSERT_THAT -#define VKD3D_TEST_ASSERT_THAT(args...) \ - vkd3d_test_assert_that(vkd3d_line, args); } while (0) +#define VKD3D_TEST_ASSERT_THAT(...) \ + vkd3d_test_assert_that(vkd3d_line, __VA_ARGS__); } while (0) #define ok_(line) \ do { \ unsigned int vkd3d_line = line; \ VKD3D_TEST_OK -#define VKD3D_TEST_OK(args...) \ - vkd3d_test_ok(vkd3d_line, args); } while (0) +#define VKD3D_TEST_OK(...) \ + vkd3d_test_ok(vkd3d_line, __VA_ARGS__); } while (0) #define todo_(line) \ do { \ unsigned int vkd3d_line = line; \ VKD3D_TEST_TODO -#define VKD3D_TEST_TODO(args...) \ - vkd3d_test_todo(vkd3d_line, args); } while (0) +#define VKD3D_TEST_TODO(...) \ + vkd3d_test_todo(vkd3d_line, __VA_ARGS__); } while (0) #define skip_(line) \ do { \ unsigned int vkd3d_line = line; \ VKD3D_TEST_SKIP -#define VKD3D_TEST_SKIP(args...) \ - vkd3d_test_skip(vkd3d_line, args); } while (0) +#define VKD3D_TEST_SKIP(...) \ + vkd3d_test_skip(vkd3d_line, __VA_ARGS__); } while (0) #define trace_(line) \ do { \ unsigned int vkd3d_line = line; \ VKD3D_TEST_TRACE -#define VKD3D_TEST_TRACE(args...) \ - vkd3d_test_trace(vkd3d_line, args); } while (0) +#define VKD3D_TEST_TRACE(...) \ + vkd3d_test_trace(vkd3d_line, __VA_ARGS__); } while (0) #define todo_if(is_todo) \ for (vkd3d_test_start_todo(is_todo); vkd3d_test_loop_todo(); vkd3d_test_end_todo())

1 0

Hans-Kristian Arntzen : vkd3d: Add MSVC path for popcount.
by Alexandre Julliard Oct. 1, 2019

Oct. 1, 2019

Module: vkd3d Branch: master Commit: 1e5ebae3392a0b72c069280570a5cac7f00fd0a9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1e5ebae3392a0b72c069280… Author: Hans-Kristian Arntzen <post(a)arntzen-software.no> Date: Tue Oct 1 12:33:38 2019 +0200 vkd3d: Add MSVC path for popcount. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_common.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 1ac8a63..ba4b68a 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -26,6 +26,10 @@ #include <limits.h> #include <stdbool.h> +#ifdef _MSC_VER +#include <intrin.h> +#endif + #ifndef ARRAY_SIZE # define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) #endif @@ -51,7 +55,9 @@ static inline size_t align(size_t addr, size_t alignment) static inline unsigned int vkd3d_popcount(unsigned int v) { -#ifdef HAVE_BUILTIN_POPCOUNT +#ifdef _MSC_VER + return __popcnt(v); +#elif defined(HAVE_BUILTIN_POPCOUNT) return __builtin_popcount(v); #else v -= (v >> 1) & 0x55555555;

1 0

Hans-Kristian Arntzen : vkd3d: Deal with Map out parameter being NULL.
by Alexandre Julliard Oct. 1, 2019

Oct. 1, 2019

Module: vkd3d Branch: master Commit: 19b673923bd75b642c4eea5eac6f37460202bc66 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=19b673923bd75b642c4eea5… Author: Hans-Kristian Arntzen <post(a)arntzen-software.no> Date: Tue Oct 1 15:53:35 2019 +0200 vkd3d: Deal with Map out parameter being NULL. It is possible to map a resource, but not disclose the VA to caller. This is used for WriteToSubresource. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 88f184d..f9738f3 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -423,7 +423,8 @@ static HRESULT d3d12_heap_map(struct d3d12_heap *heap, uint64_t offset, if ((rc = pthread_mutex_lock(&heap->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); - *data = NULL; + if (data) + *data = NULL; return hresult_from_errno(rc); } @@ -456,13 +457,15 @@ static HRESULT d3d12_heap_map(struct d3d12_heap *heap, uint64_t offset, if (hr == S_OK) { assert(heap->map_ptr); - *data = (BYTE *)heap->map_ptr + offset; + if (data) + *data = (BYTE *)heap->map_ptr + offset; ++resource->map_count; } else { assert(!heap->map_ptr); - *data = NULL; + if (data) + *data = NULL; } pthread_mutex_unlock(&heap->mutex); @@ -1235,7 +1238,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT if (FAILED(hr = d3d12_heap_map(resource->heap, resource->heap_offset, resource, data))) WARN("Failed to map resource %p, hr %#x.\n", resource, hr); - TRACE("Returning pointer %p.\n", *data); + if (data) + TRACE("Returning pointer %p.\n", *data); return hr; }

1 0

Hans-Kristian Arntzen : vkd3d: Add MSVC path for vkd3d_log2i.
by Alexandre Julliard Oct. 1, 2019

Oct. 1, 2019

Module: vkd3d Branch: master Commit: 69660ca5c908fe17ab0ad717454fcd01fce93e0a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=69660ca5c908fe17ab0ad71… Author: Hans-Kristian Arntzen <post(a)arntzen-software.no> Date: Tue Oct 1 12:33:39 2019 +0200 vkd3d: Add MSVC path for vkd3d_log2i. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_common.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index ba4b68a..d8fb361 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -84,7 +84,13 @@ static inline bool vkd3d_bitmask_is_contiguous(unsigned int mask) /* Undefined for x == 0. */ static inline unsigned int vkd3d_log2i(unsigned int x) { -#ifdef HAVE_BUILTIN_CLZ +#ifdef _MSC_VER + /* _BitScanReverse returns the index of the highest set bit, + * unlike clz which is 31 - index. */ + unsigned long result; + _BitScanReverse(&result, x); + return (unsigned int)result; +#elif defined(HAVE_BUILTIN_CLZ) return __builtin_clz(x) ^ 0x1f; #else static const unsigned int l[] =

1 0

Hans-Kristian Arntzen : vkd3d-shader: Fix MSVC build.
by Alexandre Julliard Oct. 1, 2019

Oct. 1, 2019

Module: vkd3d Branch: master Commit: 7a7ed132ec2e8b7bf352fe50cafcb1b52ff700d4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7a7ed132ec2e8b7bf352fe5… Author: Hans-Kristian Arntzen <post(a)arntzen-software.no> Date: Tue Oct 1 12:33:41 2019 +0200 vkd3d-shader: Fix MSVC build. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index fe8935c..580230f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4540,7 +4540,7 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_compiler *compiler) { - uint32_t param_type_id[MAX_REG_OUTPUT + 1], param_id[MAX_REG_OUTPUT + 1] = {}; + uint32_t param_type_id[MAX_REG_OUTPUT + 1], param_id[MAX_REG_OUTPUT + 1] = {0}; uint32_t void_id, type_id, ptr_type_id, function_type_id, function_id; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_signature *signature; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 47764e5..940cb76 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -56,7 +56,6 @@ #include <limits.h> #include <stdbool.h> #include <string.h> -#include <strings.h> #define VKD3D_VEC4_SIZE 4

1 0

Hans-Kristian Arntzen : vkd3d: Fix non-standard pointer arithmetic on void-pointer.
by Alexandre Julliard Oct. 1, 2019

Oct. 1, 2019

Module: vkd3d Branch: master Commit: 25c11733edf76f4933fb9c389e1ccafd187724c1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=25c11733edf76f4933fb9c3… Author: Hans-Kristian Arntzen <post(a)arntzen-software.no> Date: Tue Oct 1 12:33:46 2019 +0200 vkd3d: Fix non-standard pointer arithmetic on void-pointer. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index aebe1fa..88f184d 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1388,7 +1388,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_ReadFromSubresource(ID3D12Resour size = (box.right - box.left) / format->block_width * format->byte_count * format->block_byte_count; for (z = box.front; z < box.back; ++z) { - dst = dst_data + (z - box.front) * dst_slice_pitch; + dst = (uint8_t *)dst_data + (z - box.front) * dst_slice_pitch; src = src_data + z * vk_layout.depthPitch + box.top / format->block_height * vk_layout.rowPitch; for (y = box.top; y < box.bottom; y += format->block_height) {

1 0

Hans-Kristian Arntzen : vkd3d: Fix MSVC build of state.c.
by Alexandre Julliard Oct. 1, 2019

Oct. 1, 2019

Module: vkd3d Branch: master Commit: 0282b2643cc2ae3b7a00af96ceec052e2508296d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0282b2643cc2ae3b7a00af9… Author: Hans-Kristian Arntzen <post(a)arntzen-software.no> Date: Tue Oct 1 12:33:47 2019 +0200 vkd3d: Fix MSVC build of state.c. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 12a711b..9dc5cff 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1342,7 +1342,7 @@ static HRESULT create_shader_stage(struct d3d12_device *device, struct vkd3d_shader_code dxbc = {code->pShaderBytecode, code->BytecodeLength}; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; struct VkShaderModuleCreateInfo shader_desc; - struct vkd3d_shader_code spirv = {}; + struct vkd3d_shader_code spirv = {0}; VkResult vr; int ret;

1 0

Jactry Zeng : tests: Add tests for bufinfo instructions.
by Alexandre Julliard Oct. 1, 2019

Oct. 1, 2019

Module: vkd3d Branch: master Commit: 4feb40b6b322faf7445e018e4400aa05529c4c9a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4feb40b6b322faf7445e018… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Sep 26 15:22:33 2019 +0800 tests: Add tests for bufinfo instructions. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 366 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 366 insertions(+) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=4feb40b6b322faf7445…

1 0

Francois Gouget : testbot/WineRunBuild: Tweak the 'powered off VM' notification email.
by Alexandre Julliard Oct. 1, 2019

Oct. 1, 2019

Module: tools Branch: master Commit: 11ddd2e812b14c7558b9fc3642c0043ca7cab2d9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=11ddd2e812b14c7558b9fc3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 1 03:35:57 2019 +0200 testbot/WineRunBuild: Tweak the 'powered off VM' notification email. Show the Libvirt Domain's state and point to the job page as we do in the other WineRun* scripts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 89582a1..71e7e39 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -337,15 +337,18 @@ if (!$Debug and $VM->Status ne "running") Error("The VM is not ready for use (" . $VM->Status . ")\n"); WrapUpAndExit('queued'); } -if (!$VM->GetDomain()->IsPoweredOn()) +my $Domain = $VM->GetDomain(); +if (!$Domain->IsPoweredOn()) { # Maybe the VM was prepared in advance and got taken down by a power outage? # Requeue the task and treat this event as a failed revert to avoid infinite # loops. Error("The VM is not powered on\n"); NotifyAdministrator("Putting the ". $VM->Name ." VM offline", - "The VM is not powered on despite its status being 'running'.\n". - "The VM has been put offline and the TestBot will try to regain\n". + "The ". $VM->Name ." VM should have been powered on to run the task\n". + "below but its state was ". $Domain->GetStateDescription() ." instead.\n". + MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n\n". + "So the VM has been put offline and the TestBot will try to regain\n". "access to it."); WrapUpAndExit('queued', undef, undef, 'boterror vm off'); }

1 0