May 2019 - Wine-devel - list.winehq.org

[PATCH 4/4] dxgi: Acquire Vulkan image just before present when we have user images.
by Józef Kucia 06 May '19

06 May '19

The current DXGI back buffer index is independent of the current Vulkan image index when we have user images. We can use this fact to delay calling vkAcquireNextImageKHR(). This increases GPU utilization from 84% to 100% in the main menu of Metro Exouds on Nvidia. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 60 ++++++++++++++++++++++++++++++++----------- 1 file changed, 45 insertions(+), 15 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index dbb3f3462577..e09df4862d87 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -989,6 +989,8 @@ static HRESULT hresult_from_vk_result(VkResult vr) } } +#define INVALID_VK_IMAGE_INDEX (~(uint32_t)0) + struct d3d12_swapchain { IDXGISwapChain3 IDXGISwapChain3_iface; @@ -1538,13 +1540,15 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, return S_OK; } -static VkResult d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapchain) +static VkResult d3d12_swapchain_acquire_next_vulkan_image(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; VkDevice vk_device = swapchain->vk_device; VkFence vk_fence = swapchain->vk_fence; VkResult vr; + swapchain->vk_image_index = INVALID_VK_IMAGE_INDEX; + if ((vr = vk_funcs->p_vkAcquireNextImageKHR(vk_device, swapchain->vk_swapchain, UINT64_MAX, VK_NULL_HANDLE, vk_fence, &swapchain->vk_image_index)) < 0) { @@ -1552,9 +1556,6 @@ static VkResult d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapc return vr; } - if (!d3d12_swapchain_has_user_images(swapchain)) - swapchain->current_buffer_index = swapchain->vk_image_index; - if ((vr = vk_funcs->p_vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX)) != VK_SUCCESS) { ERR("Failed to wait for fence, vr %d.\n", vr); @@ -1566,6 +1567,23 @@ static VkResult d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapc return vr; } +static VkResult d3d12_swapchain_acquire_next_back_buffer(struct d3d12_swapchain *swapchain) +{ + VkResult vr; + + /* If we don't have user images, we need to acquire a Vulkan image in order + * to get the correct value for the current back buffer index. */ + if (d3d12_swapchain_has_user_images(swapchain)) + return VK_SUCCESS; + + if ((vr = d3d12_swapchain_acquire_next_vulkan_image(swapchain)) >= 0) + swapchain->current_buffer_index = swapchain->vk_image_index; + else + ERR("Failed to acquire Vulkan image, vr %d.\n", vr); + + return vr; +} + static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain, BOOL destroy_user_buffers) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; @@ -1717,6 +1735,8 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s swapchain->vk_swapchain_width = width; swapchain->vk_swapchain_height = height; + swapchain->vk_image_index = INVALID_VK_IMAGE_INDEX; + return d3d12_swapchain_create_buffers(swapchain, vk_swapchain_format, vk_format); } @@ -1725,16 +1745,17 @@ static HRESULT d3d12_swapchain_recreate_vulkan_swapchain(struct d3d12_swapchain VkResult vr; HRESULT hr; - if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) + if (SUCCEEDED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) + { + vr = d3d12_swapchain_acquire_next_back_buffer(swapchain); + hr = hresult_from_vk_result(vr); + } + else { ERR("Failed to recreate Vulkan swapchain, hr %#x.\n", hr); - return hr; } - if ((vr = d3d12_swapchain_acquire_next_image(swapchain)) < 0) - ERR("Failed to acquire Vulkan image after recreating swapchain, vr %d.\n", vr); - - return hresult_from_vk_result(vr); + return hr; } static inline struct d3d12_swapchain *d3d12_swapchain_from_IDXGISwapChain3(IDXGISwapChain3 *iface) @@ -1921,6 +1942,14 @@ static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkSubmitInfo submit_info; VkResult vr; + if (swapchain->vk_image_index == INVALID_VK_IMAGE_INDEX) + { + if ((vr = d3d12_swapchain_acquire_next_vulkan_image(swapchain)) < 0) + return vr; + } + + assert(swapchain->vk_image_index < swapchain->buffer_count); + present_info.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR; present_info.pNext = NULL; present_info.waitSemaphoreCount = 0; @@ -1967,7 +1996,10 @@ static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, present_info.pWaitSemaphores = &swapchain->vk_semaphores[swapchain->vk_image_index]; } - return vk_funcs->p_vkQueuePresentKHR(vk_queue, &present_info); + if ((vr = vk_funcs->p_vkQueuePresentKHR(vk_queue, &present_info)) >= 0) + swapchain->vk_image_index = INVALID_VK_IMAGE_INDEX; + + return vr; } static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, @@ -2036,8 +2068,7 @@ static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, } swapchain->current_buffer_index = (swapchain->current_buffer_index + 1) % swapchain->desc.BufferCount; - - vr = d3d12_swapchain_acquire_next_image(swapchain); + vr = d3d12_swapchain_acquire_next_back_buffer(swapchain); if (vr == VK_ERROR_OUT_OF_DATE_KHR) { if (!d3d12_swapchain_has_user_images(swapchain)) @@ -2745,9 +2776,8 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI swapchain->vk_fence = vk_fence; swapchain->current_buffer_index = 0; - if ((vr = d3d12_swapchain_acquire_next_image(swapchain)) < 0) + if ((vr = d3d12_swapchain_acquire_next_back_buffer(swapchain)) < 0) { - ERR("Failed to acquire Vulkan image, vr %d.\n", vr); d3d12_swapchain_destroy(swapchain); return hresult_from_vk_result(vr); } -- 2.21.0

2 1

[PATCH 3/4] dxgi: Add some asserts for Vulkan swapchains.
by Józef Kucia 06 May '19

06 May '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index b4404e250b53..dbb3f3462577 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1231,6 +1231,7 @@ static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapc for (i = 0; i < swapchain->desc.BufferCount; ++i) { + assert(swapchain->vk_images[i] == VK_NULL_HANDLE); if ((vr = vk_funcs->p_vkCreateImage(vk_device, &image_info, NULL, &swapchain->vk_images[i])) < 0) { WARN("Failed to create Vulkan image, vr %d.\n", vr); @@ -1265,6 +1266,7 @@ static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapc memory_type_mask, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, &allocate_info.memoryTypeIndex))) return hr; + assert(swapchain->vk_memory == VK_NULL_HANDLE); if ((vr = vk_funcs->p_vkAllocateMemory(vk_device, &allocate_info, NULL, &swapchain->vk_memory)) < 0) { WARN("Failed to allocate device memory, vr %d.\n", vr); @@ -1392,6 +1394,7 @@ static HRESULT d3d12_swapchain_prepare_command_buffers(struct d3d12_swapchain *s pool_info.flags = VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT; pool_info.queueFamilyIndex = queue_family_index; + assert(swapchain->vk_cmd_pool == VK_NULL_HANDLE); if ((vr = vk_funcs->p_vkCreateCommandPool(vk_device, &pool_info, NULL, &swapchain->vk_cmd_pool)) < 0) { @@ -1419,6 +1422,7 @@ static HRESULT d3d12_swapchain_prepare_command_buffers(struct d3d12_swapchain *s semaphore_info.pNext = NULL; semaphore_info.flags = 0; + assert(swapchain->vk_semaphores[i] == VK_NULL_HANDLE); if ((vr = vk_funcs->p_vkCreateSemaphore(vk_device, &semaphore_info, NULL, &swapchain->vk_semaphores[i])) < 0) { @@ -2075,6 +2079,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetBuffer(IDXGISwapChain3 *ifac return DXGI_ERROR_INVALID_CALL; } + assert(swapchain->buffers[buffer_idx]); return ID3D12Resource_QueryInterface(swapchain->buffers[buffer_idx], iid, surface); } @@ -2423,6 +2428,7 @@ static UINT STDMETHODCALLTYPE d3d12_swapchain_GetCurrentBackBufferIndex(IDXGISwa TRACE("iface %p.\n", iface); TRACE("Current back buffer index %u.\n", swapchain->current_buffer_index); + assert(swapchain->current_buffer_index < swapchain->desc.BufferCount); return swapchain->current_buffer_index; } -- 2.21.0

2 1

[PATCH 2/4] dxgi: Make Vulkan swapchain image count independent of DXGI buffer count.
by Józef Kucia 06 May '19

06 May '19

Vulkan can create more swapchain images than requested. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 111 +++++++++++++++++++++++------------------- 1 file changed, 60 insertions(+), 51 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 54a5178f7136..b4404e250b53 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -952,6 +952,7 @@ struct dxgi_vk_funcs PFN_vkDestroyImage p_vkDestroyImage; PFN_vkDestroySemaphore p_vkDestroySemaphore; PFN_vkDestroySurfaceKHR p_vkDestroySurfaceKHR; + PFN_vkResetCommandBuffer p_vkResetCommandBuffer; PFN_vkDestroySwapchainKHR p_vkDestroySwapchainKHR; PFN_vkEndCommandBuffer p_vkEndCommandBuffer; PFN_vkFreeMemory p_vkFreeMemory; @@ -1003,6 +1004,7 @@ struct d3d12_swapchain VkDeviceMemory vk_memory; VkCommandPool vk_cmd_pool; VkImage vk_images[DXGI_MAX_SWAP_CHAIN_BUFFERS]; + VkImage vk_swapchain_images[DXGI_MAX_SWAP_CHAIN_BUFFERS]; VkCommandBuffer vk_cmd_buffers[DXGI_MAX_SWAP_CHAIN_BUFFERS]; VkSemaphore vk_semaphores[DXGI_MAX_SWAP_CHAIN_BUFFERS]; ID3D12Resource *buffers[DXGI_MAX_SWAP_CHAIN_BUFFERS]; @@ -1011,7 +1013,8 @@ struct d3d12_swapchain unsigned int vk_swapchain_height; VkPresentModeKHR present_mode; - uint32_t current_buffer_index; + uint32_t vk_image_index; + unsigned int current_buffer_index; struct dxgi_vk_funcs vk_funcs; ID3D12CommandQueue *command_queue; @@ -1226,7 +1229,7 @@ static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapc image_info.pQueueFamilyIndices = NULL; image_info.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; - for (i = 0; i < swapchain->buffer_count; ++i) + for (i = 0; i < swapchain->desc.BufferCount; ++i) { if ((vr = vk_funcs->p_vkCreateImage(vk_device, &image_info, NULL, &swapchain->vk_images[i])) < 0) { @@ -1238,7 +1241,7 @@ static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapc memory_size = 0; memory_type_mask = ~0u; - for (i = 0; i < swapchain->buffer_count; ++i) + for (i = 0; i < swapchain->desc.BufferCount; ++i) { vk_funcs->p_vkGetImageMemoryRequirements(vk_device, swapchain->vk_images[i], &requirements); @@ -1269,7 +1272,7 @@ static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapc return hresult_from_vk_result(vr); } - for (i = 0; i < swapchain->buffer_count; ++i) + for (i = 0; i < swapchain->desc.BufferCount; ++i) { if ((vr = vk_funcs->p_vkBindImageMemory(vk_device, swapchain->vk_images[i], swapchain->vk_memory, image_offset[i])) < 0) @@ -1374,7 +1377,7 @@ static VkResult d3d12_swapchain_record_swapchain_blit(struct d3d12_swapchain *sw } static HRESULT d3d12_swapchain_prepare_command_buffers(struct d3d12_swapchain *swapchain, - uint32_t queue_family_index, VkImage vk_swapchain_images[DXGI_MAX_SWAP_CHAIN_BUFFERS]) + uint32_t queue_family_index) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; VkDevice vk_device = swapchain->vk_device; @@ -1386,7 +1389,7 @@ static HRESULT d3d12_swapchain_prepare_command_buffers(struct d3d12_swapchain *s pool_info.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO; pool_info.pNext = NULL; - pool_info.flags = 0; + pool_info.flags = VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT; pool_info.queueFamilyIndex = queue_family_index; if ((vr = vk_funcs->p_vkCreateCommandPool(vk_device, &pool_info, @@ -1410,15 +1413,6 @@ static HRESULT d3d12_swapchain_prepare_command_buffers(struct d3d12_swapchain *s return hresult_from_vk_result(vr); } - for (i = 0; i < swapchain->buffer_count; ++i) - { - VkCommandBuffer vk_cmd_buffer = swapchain->vk_cmd_buffers[i]; - - if ((vr = d3d12_swapchain_record_swapchain_blit(swapchain, vk_cmd_buffer, - vk_swapchain_images[i], swapchain->vk_images[i])) < 0) - return hresult_from_vk_result(vr); - } - for (i = 0; i < swapchain->buffer_count; ++i) { semaphore_info.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO; @@ -1441,7 +1435,6 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, VkFormat vk_swapchain_format, VkFormat vk_format) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; - VkImage vk_swapchain_images[DXGI_MAX_SWAP_CHAIN_BUFFERS]; struct vkd3d_image_resource_create_info resource_info; VkSwapchainKHR vk_swapchain = swapchain->vk_swapchain; ID3D12CommandQueue *queue = swapchain->command_queue; @@ -1458,13 +1451,14 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); return hresult_from_vk_result(vr); } - if (image_count != swapchain->desc.BufferCount) - FIXME("Got %u swapchain images, expected %u.\n", image_count, swapchain->desc.BufferCount); - if (image_count > ARRAY_SIZE(vk_swapchain_images)) + if (image_count > ARRAY_SIZE(swapchain->vk_swapchain_images)) + { + FIXME("Unsupported Vulkan swapchain image count %u.\n", image_count); return E_FAIL; + } swapchain->buffer_count = image_count; if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, - &image_count, vk_swapchain_images)) < 0) + &image_count, swapchain->vk_swapchain_images)) < 0) { WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); return hresult_from_vk_result(vr); @@ -1492,6 +1486,11 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, FIXME("Swapchain blit not implemented for command queue type %#x.\n", queue_desc.Type); if (vk_swapchain_format != vk_format) return E_NOTIMPL; + if (image_count != swapchain->desc.BufferCount) + { + FIXME("Got %u swapchain images, expected %u.\n", image_count, swapchain->desc.BufferCount); + return E_NOTIMPL; + } } queue_family_index = vkd3d_get_vk_queue_family_index(queue); @@ -1502,15 +1501,14 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, if (FAILED(hr = d3d12_swapchain_create_user_buffers(swapchain, vk_format))) return hr; - if (FAILED(hr = d3d12_swapchain_prepare_command_buffers(swapchain, - queue_family_index, vk_swapchain_images))) + if (FAILED(hr = d3d12_swapchain_prepare_command_buffers(swapchain, queue_family_index))) return hr; } if (swapchain->buffers[0]) return S_OK; - for (i = 0; i < swapchain->buffer_count; ++i) + for (i = 0; i < swapchain->desc.BufferCount; ++i) { if (swapchain->vk_images[i]) { @@ -1519,7 +1517,7 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, } else { - resource_info.vk_image = vk_swapchain_images[i]; + resource_info.vk_image = swapchain->vk_swapchain_images[i]; resource_info.present_state = D3D12_RESOURCE_STATE_PRESENT; } @@ -1544,12 +1542,15 @@ static VkResult d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapc VkResult vr; if ((vr = vk_funcs->p_vkAcquireNextImageKHR(vk_device, swapchain->vk_swapchain, UINT64_MAX, - VK_NULL_HANDLE, vk_fence, &swapchain->current_buffer_index)) < 0) + VK_NULL_HANDLE, vk_fence, &swapchain->vk_image_index)) < 0) { WARN("Failed to acquire next Vulkan image, vr %d.\n", vr); return vr; } + if (!d3d12_swapchain_has_user_images(swapchain)) + swapchain->current_buffer_index = swapchain->vk_image_index; + if ((vr = vk_funcs->p_vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX)) != VK_SUCCESS) { ERR("Failed to wait for fence, vr %d.\n", vr); @@ -1581,28 +1582,27 @@ static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain, B } } - for (i = 0; i < swapchain->buffer_count; ++i) + for (i = 0; i < swapchain->desc.BufferCount; ++i) { if (swapchain->buffers[i] && (destroy_user_buffers || !d3d12_swapchain_has_user_images(swapchain))) { vkd3d_resource_decref(swapchain->buffers[i]); swapchain->buffers[i] = NULL; } - - if (swapchain->vk_device) + if (swapchain->vk_device && destroy_user_buffers) { - if (destroy_user_buffers) - { - vk_funcs->p_vkDestroyImage(swapchain->vk_device, swapchain->vk_images[i], NULL); - swapchain->vk_images[i] = VK_NULL_HANDLE; - } - vk_funcs->p_vkDestroySemaphore(swapchain->vk_device, swapchain->vk_semaphores[i], NULL); - swapchain->vk_semaphores[i] = VK_NULL_HANDLE; + vk_funcs->p_vkDestroyImage(swapchain->vk_device, swapchain->vk_images[i], NULL); + swapchain->vk_images[i] = VK_NULL_HANDLE; } } if (swapchain->vk_device) { + for (i = 0; i < swapchain->buffer_count; ++i) + { + vk_funcs->p_vkDestroySemaphore(swapchain->vk_device, swapchain->vk_semaphores[i], NULL); + swapchain->vk_semaphores[i] = VK_NULL_HANDLE; + } if (destroy_user_buffers) { vk_funcs->p_vkFreeMemory(swapchain->vk_device, swapchain->vk_memory, NULL); @@ -1893,16 +1893,6 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha if (swapchain->present_mode == present_mode) return S_OK; - /* - * We recreate the swapchain only when the current buffer index is 0, in order to preserve the - * expected back buffer index sequence. - */ - if (swapchain->current_buffer_index) - { - WARN("Skipping sync interval change, current buffer index %u.\n", swapchain->current_buffer_index); - return S_OK; - } - if (!d3d12_swapchain_has_user_images(swapchain)) { FIXME("Cannot recreate swapchain without user images.\n"); @@ -1933,21 +1923,35 @@ static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, present_info.pWaitSemaphores = NULL; present_info.swapchainCount = 1; present_info.pSwapchains = &swapchain->vk_swapchain; - present_info.pImageIndices = &swapchain->current_buffer_index; + present_info.pImageIndices = &swapchain->vk_image_index; present_info.pResults = NULL; if (d3d12_swapchain_has_user_images(swapchain)) { /* blit */ + VkCommandBuffer vk_cmd_buffer = swapchain->vk_cmd_buffers[swapchain->vk_image_index]; + VkImage vk_dst_image = swapchain->vk_swapchain_images[swapchain->vk_image_index]; + VkImage vk_src_image = swapchain->vk_images[swapchain->current_buffer_index]; + + if ((vr = vk_funcs->p_vkResetCommandBuffer(vk_cmd_buffer, 0)) < 0) + { + ERR("Failed to reset command buffer, vr %d.\n", vr); + return vr; + } + + if ((vr = d3d12_swapchain_record_swapchain_blit(swapchain, + vk_cmd_buffer, vk_dst_image, vk_src_image)) < 0 ) + return vr; + submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; submit_info.pNext = NULL; submit_info.waitSemaphoreCount = 0; submit_info.pWaitSemaphores = NULL; submit_info.pWaitDstStageMask = NULL; submit_info.commandBufferCount = 1; - submit_info.pCommandBuffers = &swapchain->vk_cmd_buffers[swapchain->current_buffer_index]; + submit_info.pCommandBuffers = &vk_cmd_buffer; submit_info.signalSemaphoreCount = 1; - submit_info.pSignalSemaphores = &swapchain->vk_semaphores[swapchain->current_buffer_index]; + submit_info.pSignalSemaphores = &swapchain->vk_semaphores[swapchain->vk_image_index]; if ((vr = vk_funcs->p_vkQueueSubmit(vk_queue, 1, &submit_info, VK_NULL_HANDLE)) < 0) { @@ -1956,7 +1960,7 @@ static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, } present_info.waitSemaphoreCount = 1; - present_info.pWaitSemaphores = &swapchain->vk_semaphores[swapchain->current_buffer_index]; + present_info.pWaitSemaphores = &swapchain->vk_semaphores[swapchain->vk_image_index]; } return vk_funcs->p_vkQueuePresentKHR(vk_queue, &present_info); @@ -2027,6 +2031,8 @@ static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, return hresult_from_vk_result(vr); } + swapchain->current_buffer_index = (swapchain->current_buffer_index + 1) % swapchain->desc.BufferCount; + vr = d3d12_swapchain_acquire_next_image(swapchain); if (vr == VK_ERROR_OUT_OF_DATE_KHR) { @@ -2063,7 +2069,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetBuffer(IDXGISwapChain3 *ifac TRACE("iface %p, buffer_idx %u, iid %s, surface %p.\n", iface, buffer_idx, debugstr_guid(iid), surface); - if (buffer_idx >= swapchain->buffer_count) + if (buffer_idx >= swapchain->desc.BufferCount) { WARN("Invalid buffer index %u.\n", buffer_idx); return DXGI_ERROR_INVALID_CALL; @@ -2133,7 +2139,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain3 * if (flags) FIXME("Ignoring flags %#x.\n", flags); - for (i = 0; i < swapchain->buffer_count; ++i) + for (i = 0; i < swapchain->desc.BufferCount; ++i) { ID3D12Resource_AddRef(swapchain->buffers[i]); if ((refcount = ID3D12Resource_Release(swapchain->buffers[i]))) @@ -2416,6 +2422,7 @@ static UINT STDMETHODCALLTYPE d3d12_swapchain_GetCurrentBackBufferIndex(IDXGISwa TRACE("iface %p.\n", iface); + TRACE("Current back buffer index %u.\n", swapchain->current_buffer_index); return swapchain->current_buffer_index; } @@ -2603,6 +2610,7 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, Vk LOAD_DEVICE_PFN(vkDestroySwapchainKHR) LOAD_DEVICE_PFN(vkEndCommandBuffer) LOAD_DEVICE_PFN(vkFreeMemory) + LOAD_DEVICE_PFN(vkResetCommandBuffer) LOAD_DEVICE_PFN(vkGetImageMemoryRequirements) LOAD_DEVICE_PFN(vkGetSwapchainImagesKHR) LOAD_DEVICE_PFN(vkQueuePresentKHR) @@ -2730,6 +2738,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI } swapchain->vk_fence = vk_fence; + swapchain->current_buffer_index = 0; if ((vr = d3d12_swapchain_acquire_next_image(swapchain)) < 0) { ERR("Failed to acquire Vulkan image, vr %d.\n", vr); -- 2.21.0

2 1

[PATCH 1/4] dxgi: Factor out d3d12_swapchain_record_swapchain_blit().
by Józef Kucia 06 May '19

06 May '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 126 ++++++++++++++++++++++-------------------- 1 file changed, 67 insertions(+), 59 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index a859baffc88f..54a5178f7136 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1308,6 +1308,71 @@ static void vk_cmd_image_barrier(const struct dxgi_vk_funcs *vk_funcs, VkCommand src_stage_mask, dst_stage_mask, 0, 0, NULL, 0, NULL, 1, &barrier); } +static VkResult d3d12_swapchain_record_swapchain_blit(struct d3d12_swapchain *swapchain, + VkCommandBuffer vk_cmd_buffer, VkImage vk_dst_image, VkImage vk_src_image) +{ + const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + VkCommandBufferBeginInfo begin_info; + VkImageBlit blit; + VkFilter filter; + VkResult vr; + + if (swapchain->desc.Width != swapchain->vk_swapchain_width + || swapchain->desc.Height != swapchain->vk_swapchain_height) + filter = VK_FILTER_LINEAR; + else + filter = VK_FILTER_NEAREST; + + begin_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO; + begin_info.pNext = NULL; + begin_info.flags = 0; + begin_info.pInheritanceInfo = NULL; + + if ((vr = vk_funcs->p_vkBeginCommandBuffer(vk_cmd_buffer, &begin_info)) < 0) + { + WARN("Failed to begin command buffer, vr %d.\n", vr); + return vr; + } + + vk_cmd_image_barrier(vk_funcs, vk_cmd_buffer, + VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, + 0, VK_ACCESS_TRANSFER_WRITE_BIT, + VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, vk_dst_image); + + blit.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + blit.srcSubresource.mipLevel = 0; + blit.srcSubresource.baseArrayLayer = 0; + blit.srcSubresource.layerCount = 1; + blit.srcOffsets[0].x = 0; + blit.srcOffsets[0].y = 0; + blit.srcOffsets[0].z = 0; + blit.srcOffsets[1].x = swapchain->desc.Width; + blit.srcOffsets[1].y = swapchain->desc.Height; + blit.srcOffsets[1].z = 1; + blit.dstSubresource = blit.srcSubresource; + blit.dstOffsets[0].x = 0; + blit.dstOffsets[0].y = 0; + blit.dstOffsets[0].z = 0; + blit.dstOffsets[1].x = swapchain->vk_swapchain_width; + blit.dstOffsets[1].y = swapchain->vk_swapchain_height; + blit.dstOffsets[1].z = 1; + + vk_funcs->p_vkCmdBlitImage(vk_cmd_buffer, + vk_src_image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, + vk_dst_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, + 1, &blit, filter); + + vk_cmd_image_barrier(vk_funcs, vk_cmd_buffer, + VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, + VK_ACCESS_TRANSFER_WRITE_BIT, 0, + VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, vk_dst_image); + + if ((vr = vk_funcs->p_vkEndCommandBuffer(vk_cmd_buffer)) < 0) + WARN("Failed to end command buffer, vr %d.\n", vr); + + return vr; +} + static HRESULT d3d12_swapchain_prepare_command_buffers(struct d3d12_swapchain *swapchain, uint32_t queue_family_index, VkImage vk_swapchain_images[DXGI_MAX_SWAP_CHAIN_BUFFERS]) { @@ -1315,10 +1380,7 @@ static HRESULT d3d12_swapchain_prepare_command_buffers(struct d3d12_swapchain *s VkDevice vk_device = swapchain->vk_device; VkCommandBufferAllocateInfo allocate_info; VkSemaphoreCreateInfo semaphore_info; - VkCommandBufferBeginInfo begin_info; VkCommandPoolCreateInfo pool_info; - VkImageBlit blit; - VkFilter filter; unsigned int i; VkResult vr; @@ -1348,67 +1410,13 @@ static HRESULT d3d12_swapchain_prepare_command_buffers(struct d3d12_swapchain *s return hresult_from_vk_result(vr); } - if (swapchain->desc.Width != swapchain->vk_swapchain_width - || swapchain->desc.Height != swapchain->vk_swapchain_height) - filter = VK_FILTER_LINEAR; - else - filter = VK_FILTER_NEAREST; - for (i = 0; i < swapchain->buffer_count; ++i) { VkCommandBuffer vk_cmd_buffer = swapchain->vk_cmd_buffers[i]; - begin_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO; - begin_info.pNext = NULL; - begin_info.flags = 0; - begin_info.pInheritanceInfo = NULL; - - if ((vr = vk_funcs->p_vkBeginCommandBuffer(vk_cmd_buffer, &begin_info)) < 0) - { - WARN("Failed to begin command buffer, vr %d.\n", vr); + if ((vr = d3d12_swapchain_record_swapchain_blit(swapchain, vk_cmd_buffer, + vk_swapchain_images[i], swapchain->vk_images[i])) < 0) return hresult_from_vk_result(vr); - } - - vk_cmd_image_barrier(vk_funcs, vk_cmd_buffer, - VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, - 0, VK_ACCESS_TRANSFER_WRITE_BIT, - VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, - vk_swapchain_images[i]); - - blit.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; - blit.srcSubresource.mipLevel = 0; - blit.srcSubresource.baseArrayLayer = 0; - blit.srcSubresource.layerCount = 1; - blit.srcOffsets[0].x = 0; - blit.srcOffsets[0].y = 0; - blit.srcOffsets[0].z = 0; - blit.srcOffsets[1].x = swapchain->desc.Width; - blit.srcOffsets[1].y = swapchain->desc.Height; - blit.srcOffsets[1].z = 1; - blit.dstSubresource = blit.srcSubresource; - blit.dstOffsets[0].x = 0; - blit.dstOffsets[0].y = 0; - blit.dstOffsets[0].z = 0; - blit.dstOffsets[1].x = swapchain->vk_swapchain_width; - blit.dstOffsets[1].y = swapchain->vk_swapchain_height; - blit.dstOffsets[1].z = 1; - - vk_funcs->p_vkCmdBlitImage(vk_cmd_buffer, - swapchain->vk_images[i], VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, - vk_swapchain_images[i], VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, - 1, &blit, filter); - - vk_cmd_image_barrier(vk_funcs, vk_cmd_buffer, - VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, - VK_ACCESS_TRANSFER_WRITE_BIT, 0, - VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, - vk_swapchain_images[i]); - - if ((vr = vk_funcs->p_vkEndCommandBuffer(vk_cmd_buffer)) < 0) - { - WARN("Failed to end command buffer, vr %d.\n", vr); - return hresult_from_vk_result(vr); - } } for (i = 0; i < swapchain->buffer_count; ++i) -- 2.21.0

2 1

[PATCH 5/5] hid: Shift usage values to LSB
by Andrew Eikum 06 May '19

06 May '19

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- This applies on top of Piotr's series. dlls/hid/hidp.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 2c4e98ad541..6a686d4334c 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -49,32 +49,27 @@ static NTSTATUS get_report_data(BYTE *report, INT reportLength, INT startBit, IN ULONG byte_index = startBit / 8; ULONG bit_index = startBit - (byte_index * 8); INT mask = (1 << bit_index); - *value = (report[byte_index] & mask); + *value = !!(report[byte_index] & mask); } else { + ULONG remaining_bits = valueSize; ULONG byte_index = startBit / 8; + ULONG bit_index = startBit % 8; ULONG data = 0; - ULONG remainingBits = valueSize; ULONG shift = 0; - ULONG begin_offset = startBit % 8; - while (remainingBits) + while (remaining_bits) { - if (remainingBits >= 8) - { - BYTE mask = 0xff << begin_offset; - data |= (report[byte_index] & mask) << shift; - byte_index ++; - remainingBits -= (8-begin_offset); - shift += (8-begin_offset); - begin_offset = 0; - } - else if (remainingBits > 0) - { - BYTE mask = (0xff >> (8-remainingBits)) << begin_offset; - data |= (report[byte_index] & mask) << shift; - remainingBits = 0; - } + ULONG copy_bits = 8 - bit_index; + if (remaining_bits < copy_bits) + copy_bits = remaining_bits; + + data |= ((report[byte_index] >> bit_index) & ((2 << copy_bits) - 1)) << shift; + + shift += copy_bits; + bit_index = 0; + byte_index++; + remaining_bits -= copy_bits; } *value = data; } -- 2.21.0

2 1

[PATCH 4/5] winebus.sys: Fix ball value reporting
by Andrew Eikum 06 May '19

06 May '19

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 4cbf5610cc2..49ec69965bf 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -275,8 +275,8 @@ static void set_ball_value(struct platform_private *ext, int index, int value1, if (value1 < -127) value1 = -127; if (value2 > 127) value2 = 127; if (value2 < -127) value2 = -127; - ext->report_buffer[offset] = value1; - ext->report_buffer[offset + 1] = value2; + *((WORD*)&ext->report_buffer[offset]) = LE_WORD(value1); + *((WORD*)&ext->report_buffer[offset + sizeof(WORD)]) = LE_WORD(value2); } static void set_hat_value(struct platform_private *ext, int index, int value) @@ -400,7 +400,7 @@ static BOOL build_report_descriptor(struct platform_private *ext) descript_size += sizeof(REPORT_AXIS_HEADER); descript_size += (sizeof(REPORT_AXIS_USAGE) * ball_count * 2); descript_size += sizeof(REPORT_REL_AXIS_TAIL); - report_size += (sizeof(WORD) * ball_count); + report_size += (sizeof(WORD) * 2 * ball_count); } hat_count = pSDL_JoystickNumHats(ext->sdl_joystick); -- 2.21.0

2 1

[PATCH 3/5] winebus.sys: Remove some magic numbers
by Andrew Eikum 06 May '19

06 May '19

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 724cd78d580..4cbf5610cc2 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -149,15 +149,17 @@ static const BYTE REPORT_AXIS_TAIL[] = { }; #define IDX_ABS_AXIS_COUNT 23 +#define CONTROLLER_NUM_BUTTONS 15 + static const BYTE CONTROLLER_BUTTONS[] = { 0x05, 0x09, /* USAGE_PAGE (Button) */ 0x19, 0x01, /* USAGE_MINIMUM (Button 1) */ - 0x29, 0x0f, /* USAGE_MAXIMUM (Button 15) */ + 0x29, CONTROLLER_NUM_BUTTONS, /* USAGE_MAXIMUM (Button 15) */ 0x15, 0x00, /* LOGICAL_MINIMUM (0) */ 0x25, 0x01, /* LOGICAL_MAXIMUM (1) */ 0x35, 0x00, /* LOGICAL_MINIMUM (0) */ 0x45, 0x01, /* LOGICAL_MAXIMUM (1) */ - 0x95, 0x0f, /* REPORT_COUNT (15) */ + 0x95, CONTROLLER_NUM_BUTTONS, /* REPORT_COUNT (15) */ 0x75, 0x01, /* REPORT_SIZE (1) */ 0x81, 0x02, /* INPUT (Data,Var,Abs) */ /* padding */ @@ -194,6 +196,8 @@ static const BYTE CONTROLLER_TRIGGERS [] = { 0x81, 0x02, /* INPUT (Data,Var,Abs) */ }; +#define CONTROLLER_NUM_AXES 6 + static const BYTE HAPTIC_RUMBLE[] = { 0x06, 0x00, 0xff, /* USAGE PAGE (vendor-defined) */ 0x09, 0x01, /* USAGE (1) */ @@ -246,7 +250,7 @@ static BYTE *add_axis_block(BYTE *report_ptr, BYTE count, BYTE page, const BYTE static void set_axis_value(struct platform_private *ext, int index, short value) { int offset; - offset = ext->axis_start + index * 2; + offset = ext->axis_start + index * sizeof(WORD); switch (index) { @@ -266,7 +270,7 @@ static void set_axis_value(struct platform_private *ext, int index, short value) static void set_ball_value(struct platform_private *ext, int index, int value1, int value2) { int offset; - offset = ext->ball_start + (index * 2); + offset = ext->ball_start + (index * sizeof(WORD)); if (value1 > 127) value1 = 127; if (value1 < -127) value1 = -127; if (value2 > 127) value2 = 127; @@ -381,7 +385,7 @@ static BOOL build_report_descriptor(struct platform_private *ext) descript_size += sizeof(REPORT_AXIS_HEADER); descript_size += (sizeof(REPORT_AXIS_USAGE) * axis_count); descript_size += sizeof(REPORT_AXIS_TAIL); - report_size += (2 * axis_count); + report_size += (sizeof(WORD) * axis_count); } ball_count = pSDL_JoystickNumBalls(ext->sdl_joystick); @@ -396,7 +400,7 @@ static BOOL build_report_descriptor(struct platform_private *ext) descript_size += sizeof(REPORT_AXIS_HEADER); descript_size += (sizeof(REPORT_AXIS_USAGE) * ball_count * 2); descript_size += sizeof(REPORT_REL_AXIS_TAIL); - report_size += (2*ball_count); + report_size += (sizeof(WORD) * ball_count); } hat_count = pSDL_JoystickNumHats(ext->sdl_joystick); @@ -404,8 +408,7 @@ static BOOL build_report_descriptor(struct platform_private *ext) if (hat_count) { descript_size += sizeof(REPORT_HATSWITCH); - for (i = 0; i < hat_count; i++) - report_size++; + report_size += hat_count; } descript_size += test_haptic(ext); @@ -482,8 +485,8 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext) descript_size += sizeof(CONTROLLER_TRIGGERS); descript_size += test_haptic(ext); - ext->axis_start = 2; - ext->buffer_length = 14; + ext->axis_start = (CONTROLLER_NUM_BUTTONS + 7) / 8; + ext->buffer_length = (CONTROLLER_NUM_BUTTONS + 7) / 8 + CONTROLLER_NUM_AXES * sizeof(WORD); TRACE("Report Descriptor will be %i bytes\n", descript_size); TRACE("Report will be %i bytes\n", ext->buffer_length); -- 2.21.0

2 1

[PATCH 2/5] winebus.sys: Fix udev report descriptor length
by Andrew Eikum 06 May '19

06 May '19

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index e8e837a75c4..a2c72406cb7 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -422,11 +422,6 @@ static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_ abs_pages[ABS_TO_HID_MAP[i][0]][abs_pages[ABS_TO_HID_MAP[i][0]][0]] = i; ioctl(ext->base.device_fd, EVIOCGABS(i), &(ext->abs_map[i])); - if (abs_pages[ABS_TO_HID_MAP[i][0]][0] == 1) - { - descript_size += sizeof(REPORT_AXIS_HEADER); - descript_size += sizeof(REPORT_ABS_AXIS_TAIL); - } } /* Skip page 0, aka HID_USAGE_PAGE_UNDEFINED */ for (i = 1; i < TOP_ABS_PAGE; i++) @@ -441,6 +436,8 @@ static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_ } abs_count++; } + descript_size += sizeof(REPORT_AXIS_HEADER) * abs_count; + descript_size += sizeof(REPORT_ABS_AXIS_TAIL) * abs_count; rel_count = 0; memset(rel_pages, 0, sizeof(rel_pages)); @@ -449,11 +446,6 @@ static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_ { rel_pages[REL_TO_HID_MAP[i][0]][0]++; rel_pages[REL_TO_HID_MAP[i][0]][rel_pages[REL_TO_HID_MAP[i][0]][0]] = i; - if (rel_pages[REL_TO_HID_MAP[i][0]][0] == 1) - { - descript_size += sizeof(REPORT_AXIS_HEADER); - descript_size += sizeof(REPORT_REL_AXIS_TAIL); - } } /* Skip page 0, aka HID_USAGE_PAGE_UNDEFINED */ for (i = 1; i < TOP_REL_PAGE; i++) @@ -468,6 +460,8 @@ static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_ } rel_count++; } + descript_size += sizeof(REPORT_AXIS_HEADER) * rel_count; + descript_size += sizeof(REPORT_REL_AXIS_TAIL) * rel_count; hat_count = 0; for (i = ABS_HAT0X; i <=ABS_HAT3X; i+=2) @@ -479,6 +473,8 @@ static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_ report_size++; hat_count++; } + if (hat_count > 0) + descript_size += sizeof(REPORT_HATSWITCH); TRACE("Report Descriptor will be %i bytes\n", descript_size); TRACE("Report will be %i bytes\n", report_size); -- 2.21.0

2 1

[PATCH 1/5] winebus.sys: Fix some report descriptors
by Andrew Eikum 06 May '19

06 May '19

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 2 +- dlls/winebus.sys/controller.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index b774df7eddc..724cd78d580 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -147,7 +147,7 @@ static const BYTE REPORT_AXIS_TAIL[] = { 0x95, 0x00, /* REPORT_COUNT (?) */ 0x81, 0x02, /* INPUT (Data,Var,Abs) */ }; -#define IDX_ABS_AXIS_COUNT 15 +#define IDX_ABS_AXIS_COUNT 23 static const BYTE CONTROLLER_BUTTONS[] = { 0x05, 0x09, /* USAGE_PAGE (Button) */ diff --git a/dlls/winebus.sys/controller.h b/dlls/winebus.sys/controller.h index 9546fe991f0..80e9c786c77 100644 --- a/dlls/winebus.sys/controller.h +++ b/dlls/winebus.sys/controller.h @@ -36,15 +36,15 @@ static const BYTE REPORT_BUTTONS[] = { 0x29, 0x03, /* USAGE_MAXIMUM (Button 3) */ 0x15, 0x00, /* LOGICAL_MINIMUM (0) */ 0x25, 0x01, /* LOGICAL_MAXIMUM (1) */ - 0x35, 0x00, /* LOGICAL_MINIMUM (0) */ - 0x45, 0x01, /* LOGICAL_MAXIMUM (1) */ + 0x35, 0x00, /* PHYSICAL_MINIMUM (0) */ + 0x45, 0x01, /* PHYSICAL_MAXIMUM (1) */ 0x95, 0x03, /* REPORT_COUNT (3) */ 0x75, 0x01, /* REPORT_SIZE (1) */ 0x81, 0x02, /* INPUT (Data,Var,Abs) */ }; #define IDX_BUTTON_MIN_USAGE 3 #define IDX_BUTTON_MAX_USAGE 5 -#define IDX_BUTTON_COUNT 11 +#define IDX_BUTTON_COUNT 15 static const BYTE REPORT_PADDING[] = { 0x95, 0x03, /* REPORT_COUNT (3) */ -- 2.21.0

2 1

[PATCH V2] server: rewrite to use all attributes for group in create_token
by Vijay Kiran Kamuju 06 May '19

06 May '19

Based on patch from Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- server/token.c | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/server/token.c b/server/token.c index e0f28c6da6e..9944e3bb69c 100644 --- a/server/token.c +++ b/server/token.c @@ -125,13 +125,7 @@ struct privilege struct group { struct list entry; - unsigned enabled : 1; /* is the sid currently enabled? */ - unsigned def : 1; /* is the sid enabled by default? */ - unsigned logon : 1; /* is this a logon sid? */ - unsigned mandatory: 1; /* is this sid always enabled? */ - unsigned owner : 1; /* can this sid be an owner of an object? */ - unsigned resource : 1; /* is this a domain-local group? */ - unsigned deny_only: 1; /* is this a sid that should be use for denying only? */ + unsigned attributes; SID sid; }; @@ -584,16 +578,10 @@ static struct token *create_token( unsigned primary, const SID *user, return NULL; } memcpy( &group->sid, groups[i].Sid, security_sid_len( groups[i].Sid )); - group->enabled = TRUE; - group->def = TRUE; - group->logon = (groups[i].Attributes & SE_GROUP_LOGON_ID) != 0; - group->mandatory = (groups[i].Attributes & SE_GROUP_MANDATORY) != 0; - group->owner = (groups[i].Attributes & SE_GROUP_OWNER) != 0; - group->resource = FALSE; - group->deny_only = FALSE; + group->attributes = (groups[i].Attributes | SE_GROUP_VALID_ATTRIBUTES); list_add_tail( &token->groups, &group->entry ); /* Use first owner capable group as owner and primary group */ - if (!token->primary_group && group->owner) + if (!token->primary_group && (group->attributes & SE_GROUP_OWNER)) { token->owner = &group->sid; token->primary_group = &group->sid; @@ -963,8 +951,8 @@ int token_sid_present( struct token *token, const SID *sid, int deny ) LIST_FOR_EACH_ENTRY( group, &token->groups, struct group, entry ) { - if (!group->enabled) continue; - if (group->deny_only && !deny) continue; + if (!(group->attributes & SE_GROUP_ENABLED)) continue; + if ((group->attributes & SE_GROUP_USE_FOR_DENY_ONLY) && !deny) continue; if (security_equal_sid( &group->sid, sid )) return TRUE; } @@ -1498,14 +1486,7 @@ DECL_HANDLER(get_token_groups) LIST_FOR_EACH_ENTRY( group, &token->groups, const struct group, entry ) { - *attr_ptr = 0; - if (group->mandatory) *attr_ptr |= SE_GROUP_MANDATORY; - if (group->def) *attr_ptr |= SE_GROUP_ENABLED_BY_DEFAULT; - if (group->enabled) *attr_ptr |= SE_GROUP_ENABLED; - if (group->owner) *attr_ptr |= SE_GROUP_OWNER; - if (group->deny_only) *attr_ptr |= SE_GROUP_USE_FOR_DENY_ONLY; - if (group->resource) *attr_ptr |= SE_GROUP_RESOURCE; - if (group->logon) *attr_ptr |= SE_GROUP_LOGON_ID; + *attr_ptr = group->attributes; memcpy(sid_ptr, &group->sid, security_sid_len( &group->sid )); -- 2.17.0

2 1