mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-19 13:18:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

comp/vk: Lock our only VkQueue with a mutex.

Browse source 
This resolved mutlithreading issues as seen in the `multithreading` test
of the OpenXR CTS.

This patch fixes the test on Vulkan Android and resolves Vulkan
validation errors when running on Linux with OpenGL.
This commit is contained in:
Lubosz Sarnecki 2021-01-08 16:29:58 +01:00
parent fd58ccecc9
commit 9a9d46b85a
5 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/xrt/auxiliary/vk/vk_helpers.c
View file

@ -645,7 +645,9 @@ vk_submit_cmd_buffer(struct vk_bundle *vk, VkCommandBuffer cmd_buffer)
} }
// Do the actual submitting. // Do the actual submitting.
os_mutex_lock(&vk->queue_mutex);
ret = vk->vkQueueSubmit(vk->queue, 1, &submitInfo, fence); ret = vk->vkQueueSubmit(vk->queue, 1, &submitInfo, fence);
os_mutex_unlock(&vk->queue_mutex);
if (ret != VK_SUCCESS) { if (ret != VK_SUCCESS) {
VK_ERROR(vk, "Error: Could not submit to queue.\n"); VK_ERROR(vk, "Error: Could not submit to queue.\n");
goto out_fence; goto out_fence;

3
src/xrt/auxiliary/vk/vk_helpers.h
View file

@ -14,6 +14,7 @@
#include "xrt/xrt_vulkan_includes.h" #include "xrt/xrt_vulkan_includes.h"
#include "xrt/xrt_handles.h" #include "xrt/xrt_handles.h"
#include "util/u_logging.h" #include "util/u_logging.h"
#include "os/os_threading.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -45,6 +46,8 @@ struct vk_bundle
uint32_t queue_index; uint32_t queue_index;
VkQueue queue; VkQueue queue;
struct os_mutex queue_mutex;
bool has_GOOGLE_display_timing; bool has_GOOGLE_display_timing;
VkDebugReportCallbackEXT debug_report_cb; VkDebugReportCallbackEXT debug_report_cb;

6
src/xrt/compositor/client/comp_vk_client.c
View file

@ -89,8 +89,11 @@ client_vk_swapchain_acquire_image(struct xrt_swapchain *xsc,
.commandBufferCount = 1, .commandBufferCount = 1,
.pCommandBuffers = &sc->acquire[*out_index], .pCommandBuffers = &sc->acquire[*out_index],
}; };
os_mutex_lock(&vk->queue_mutex);
VkResult ret = VkResult ret =
vk->vkQueueSubmit(vk->queue, 1, &submitInfo, VK_NULL_HANDLE); vk->vkQueueSubmit(vk->queue, 1, &submitInfo, VK_NULL_HANDLE);
os_mutex_unlock(&vk->queue_mutex);
if (ret != VK_SUCCESS) { if (ret != VK_SUCCESS) {
VK_ERROR(vk, "Error: Could not submit to queue.\n"); VK_ERROR(vk, "Error: Could not submit to queue.\n");
return XRT_ERROR_FAILED_TO_SUBMIT_VULKAN_COMMANDS; return XRT_ERROR_FAILED_TO_SUBMIT_VULKAN_COMMANDS;
@ -121,8 +124,11 @@ client_vk_swapchain_release_image(struct xrt_swapchain *xsc, uint32_t index)
.commandBufferCount = 1, .commandBufferCount = 1,
.pCommandBuffers = &sc->release[index], .pCommandBuffers = &sc->release[index],
}; };
os_mutex_lock(&vk->queue_mutex);
VkResult ret = VkResult ret =
vk->vkQueueSubmit(vk->queue, 1, &submitInfo, VK_NULL_HANDLE); vk->vkQueueSubmit(vk->queue, 1, &submitInfo, VK_NULL_HANDLE);
os_mutex_unlock(&vk->queue_mutex);
if (ret != VK_SUCCESS) { if (ret != VK_SUCCESS) {
VK_ERROR(vk, "Error: Could not submit to queue.\n"); VK_ERROR(vk, "Error: Could not submit to queue.\n");
return XRT_ERROR_FAILED_TO_SUBMIT_VULKAN_COMMANDS; return XRT_ERROR_FAILED_TO_SUBMIT_VULKAN_COMMANDS;

7
src/xrt/compositor/main/comp_compositor.c
View file

@ -117,6 +117,8 @@ compositor_destroy(struct xrt_compositor *xc)
vk->device = VK_NULL_HANDLE; vk->device = VK_NULL_HANDLE;
} }
os_mutex_destroy(&vk->queue_mutex);
if (vk->instance != VK_NULL_HANDLE) { if (vk->instance != VK_NULL_HANDLE) {
vk->vkDestroyInstance(vk->instance, NULL); vk->vkDestroyInstance(vk->instance, NULL);
vk->instance = VK_NULL_HANDLE; vk->instance = VK_NULL_HANDLE;
@ -932,6 +934,11 @@ compositor_init_vulkan(struct comp_compositor *c)
&c->vk, c->settings.selected_gpu_index, required_device_extensions, &c->vk, c->settings.selected_gpu_index, required_device_extensions,
ARRAY_SIZE(required_device_extensions), optional_device_extensions, ARRAY_SIZE(required_device_extensions), optional_device_extensions,
ARRAY_SIZE(optional_device_extensions)); ARRAY_SIZE(optional_device_extensions));
if (os_mutex_init(&c->vk.queue_mutex) != 0) {
return false;
}
if (ret != VK_SUCCESS) { if (ret != VK_SUCCESS) {
return false; return false;
} }

2
src/xrt/compositor/main/comp_renderer.c
View file

@ -173,8 +173,10 @@ renderer_submit_queue(struct comp_renderer *r)
.pSignalSemaphores = &r->semaphores.render_complete, .pSignalSemaphores = &r->semaphores.render_complete,
}; };
os_mutex_lock(&vk->queue_mutex);
ret = vk->vkQueueSubmit(r->queue, 1, &comp_submit_info, ret = vk->vkQueueSubmit(r->queue, 1, &comp_submit_info,
r->fences[r->current_buffer]); r->fences[r->current_buffer]);
os_mutex_unlock(&vk->queue_mutex);
if (ret != VK_SUCCESS) { if (ret != VK_SUCCESS) {
COMP_ERROR(r->c, "vkQueueSubmit: %s", vk_result_string(ret)); COMP_ERROR(r->c, "vkQueueSubmit: %s", vk_result_string(ret));
} }