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

aux/vk: Properly set log_level in given vk_bundles

Browse source
This commit is contained in:
Jakob Bornecrantz 2022-03-01 11:59:21 +00:00 committed by Jakob Bornecrantz
parent 3044794f93
commit 3c8378631f
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1832,12 +1832,14 @@ vk_init_from_given(struct vk_bundle *vk,
VkPhysicalDevice physical_device, VkPhysicalDevice physical_device,
VkDevice device, VkDevice device,
uint32_t queue_family_index, uint32_t queue_family_index,
uint32_t queue_index) uint32_t queue_index,
enum u_logging_level log_level)
{ {
VkResult ret; VkResult ret;
// First memset it clear. // First memset it clear.
U_ZERO(vk); U_ZERO(vk);
vk->log_level = log_level;
ret = vk_get_loader_functions(vk, vkGetInstanceProcAddr); ret = vk_get_loader_functions(vk, vkGetInstanceProcAddr);
if (ret != VK_SUCCESS) { if (ret != VK_SUCCESS) {

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

@ -505,7 +505,8 @@ vk_init_from_given(struct vk_bundle *vk,
VkPhysicalDevice physical_device, VkPhysicalDevice physical_device,
VkDevice device, VkDevice device,
uint32_t queue_family_index, uint32_t queue_family_index,
uint32_t queue_index); uint32_t queue_index,
enum u_logging_level log_level);
/*! /*!
* @ingroup aux_vk * @ingroup aux_vk

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

@ -661,9 +661,17 @@ client_vk_compositor_create(struct xrt_compositor_native *xcn,
c->base.base.info.format_count = xcn->base.info.format_count; c->base.base.info.format_count = xcn->base.info.format_count;
// Default to info. // Default to info.
c->vk.log_level = U_LOGGING_INFO; enum u_logging_level log_level = U_LOGGING_INFO;
ret = vk_init_from_given(&c->vk, getProc, instance, physicalDevice, device, queueFamilyIndex, queueIndex); ret = vk_init_from_given( //
&c->vk, // vk_bundle
getProc, // vkGetInstanceProcAddr
instance, // instance
physicalDevice, // physical_device
device, // device
queueFamilyIndex, // queue_family_index
queueIndex, // queue_index
log_level); // log_level
if (ret != VK_SUCCESS) { if (ret != VK_SUCCESS) {
goto err_free; goto err_free;
} }