mirror of
https://gitlab.freedesktop.org/monado/monado.git
synced 2025-02-03 12:28:07 +00:00
c/main: Implement fence functions
This commit is contained in:
parent
086bef8545
commit
2035da1ec9
src/xrt/compositor
|
@ -24,6 +24,7 @@ set(MAIN_SOURCE_FILES
|
|||
main/comp_settings.h
|
||||
main/comp_shaders.c
|
||||
main/comp_swapchain.c
|
||||
main/comp_sync.c
|
||||
main/comp_target.h
|
||||
main/comp_target_swapchain.c
|
||||
main/comp_target_swapchain.h
|
||||
|
|
|
@ -1295,6 +1295,7 @@ xrt_gfx_provider_create_system(struct xrt_device *xdev, struct xrt_system_compos
|
|||
|
||||
c->base.base.create_swapchain = comp_swapchain_create;
|
||||
c->base.base.import_swapchain = comp_swapchain_import;
|
||||
c->base.base.import_fence = comp_compositor_import_fence;
|
||||
c->base.base.begin_session = compositor_begin_session;
|
||||
c->base.base.end_session = compositor_end_session;
|
||||
c->base.base.wait_frame = compositor_wait_frame;
|
||||
|
|
|
@ -326,6 +326,14 @@ comp_swapchain_import(struct xrt_compositor *xc,
|
|||
void
|
||||
comp_swapchain_really_destroy(struct comp_swapchain *sc);
|
||||
|
||||
/*!
|
||||
* For importing fences, defined in comp_sync.c .
|
||||
*/
|
||||
xrt_result_t
|
||||
comp_compositor_import_fence(struct xrt_compositor *xc,
|
||||
xrt_graphics_sync_handle_t handle,
|
||||
struct xrt_compositor_fence **out_xcf);
|
||||
|
||||
/*!
|
||||
* Loads all of the shaders that the compositor uses.
|
||||
*/
|
||||
|
|
122
src/xrt/compositor/main/comp_sync.c
Normal file
122
src/xrt/compositor/main/comp_sync.c
Normal file
|
@ -0,0 +1,122 @@
|
|||
// Copyright 2019-2021, Collabora, Ltd.
|
||||
// SPDX-License-Identifier: BSL-1.0
|
||||
/*!
|
||||
* @file
|
||||
* @brief Sync code for the main compositor.
|
||||
* @author Jakob Bornecrantz <jakob@collabora.com>
|
||||
* @ingroup comp_main
|
||||
*/
|
||||
|
||||
#include "util/u_misc.h"
|
||||
#include "util/u_handles.h"
|
||||
|
||||
#include "main/comp_compositor.h"
|
||||
|
||||
#include <xrt/xrt_handles.h>
|
||||
#include <xrt/xrt_config_os.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <unistd.h>
|
||||
|
||||
|
||||
|
||||
struct fence
|
||||
{
|
||||
struct xrt_compositor_fence base;
|
||||
struct comp_compositor *c;
|
||||
|
||||
VkFence fence;
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
*
|
||||
* Helper functions.
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
|
||||
/*
|
||||
*
|
||||
* Fence member functions.
|
||||
*
|
||||
*/
|
||||
|
||||
static xrt_result_t
|
||||
fence_wait(struct xrt_compositor_fence *xcf, uint64_t timeout)
|
||||
{
|
||||
COMP_TRACE_MARKER();
|
||||
|
||||
struct fence *f = (struct fence *)xcf;
|
||||
struct vk_bundle *vk = &f->c->vk;
|
||||
|
||||
// Count no handle as signled fence.
|
||||
if (f->fence == VK_NULL_HANDLE) {
|
||||
return XRT_SUCCESS;
|
||||
}
|
||||
|
||||
VkResult ret = vk->vkWaitForFences(vk->device, 1, &f->fence, VK_TRUE, timeout);
|
||||
if (ret == VK_TIMEOUT) {
|
||||
return XRT_SUCCESS;
|
||||
}
|
||||
if (ret != VK_SUCCESS) {
|
||||
COMP_ERROR(f->c, "vkWaitForFences: %s", vk_result_string(ret));
|
||||
return XRT_ERROR_VULKAN;
|
||||
}
|
||||
|
||||
return XRT_SUCCESS;
|
||||
}
|
||||
|
||||
static void
|
||||
fence_destroy(struct xrt_compositor_fence *xcf)
|
||||
{
|
||||
COMP_TRACE_MARKER();
|
||||
|
||||
struct fence *f = (struct fence *)xcf;
|
||||
struct vk_bundle *vk = &f->c->vk;
|
||||
|
||||
if (f->fence != VK_NULL_HANDLE) {
|
||||
vk->vkDestroyFence(vk->device, f->fence, NULL);
|
||||
f->fence = VK_NULL_HANDLE;
|
||||
}
|
||||
|
||||
free(f);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
*
|
||||
* Compositor function.
|
||||
*
|
||||
*/
|
||||
|
||||
xrt_result_t
|
||||
comp_compositor_import_fence(struct xrt_compositor *xc,
|
||||
xrt_graphics_sync_handle_t handle,
|
||||
struct xrt_compositor_fence **out_xcf)
|
||||
{
|
||||
COMP_TRACE_MARKER();
|
||||
|
||||
struct comp_compositor *c = comp_compositor(xc);
|
||||
struct vk_bundle *vk = &c->vk;
|
||||
|
||||
VkFence fence = VK_NULL_HANDLE;
|
||||
|
||||
VkResult ret = vk_create_fence_sync_from_native(vk, handle, &fence);
|
||||
if (ret != VK_SUCCESS) {
|
||||
return XRT_ERROR_VULKAN;
|
||||
}
|
||||
|
||||
struct fence *f = U_TYPED_CALLOC(struct fence);
|
||||
f->base.wait = fence_wait;
|
||||
f->base.destroy = fence_destroy;
|
||||
f->fence = fence;
|
||||
f->c = c;
|
||||
|
||||
*out_xcf = &f->base;
|
||||
|
||||
return XRT_SUCCESS;
|
||||
}
|
|
@ -22,6 +22,7 @@ compositor_srcs = [
|
|||
'main/comp_settings.h',
|
||||
'main/comp_shaders.c',
|
||||
'main/comp_swapchain.c',
|
||||
'main/comp_sync.c',
|
||||
'main/comp_target.h',
|
||||
'main/comp_target_swapchain.c',
|
||||
'main/comp_target_swapchain.h',
|
||||
|
|
Loading…
Reference in a new issue