The open source OpenXR runtime
aux/vk: Tidy code (NFC)
+13
-22
+13
-22
src/xrt/auxiliary/vk/vk_helpers.c
+13
-22
src/xrt/auxiliary/vk/vk_helpers.c
···
1
-
// Copyright 2019-2020, Collabora, Ltd.
1
+
// Copyright 2019-2021, Collabora, Ltd.
2
2
// SPDX-License-Identifier: BSL-1.0
3
3
/*!
4
4
* @file
···
212
212
vk->vkGetImageMemoryRequirements(vk->device, image, &memory_requirements);
213
213
214
214
if (max_size > 0 && memory_requirements.size > max_size) {
215
-
VK_ERROR(vk,
216
-
"client_vk_swapchain - Got too little memory "
217
-
"%u vs %u\n",
215
+
VK_ERROR(vk, "client_vk_swapchain - Got too little memory %u vs %u\n",
218
216
(uint32_t)memory_requirements.size, (uint32_t)max_size);
219
217
return VK_ERROR_OUT_OF_DEVICE_MEMORY;
220
218
}
···
313
311
{
314
312
VkImageUsageFlags image_usage = vk_swapchain_usage_flags(vk, (VkFormat)info->format, info->bits);
315
313
if (image_usage == 0) {
316
-
U_LOG_E(
317
-
"vk_create_image_from_native: Unsupported swapchain usage "
318
-
"flags");
314
+
U_LOG_E("vk_create_image_from_native: Unsupported swapchain usage flags");
319
315
return VK_ERROR_FEATURE_NOT_PRESENT;
320
316
}
321
317
···
1000
996
uint32_t gpu_index = 0;
1001
997
if (forced_index > -1) {
1002
998
if ((uint32_t)forced_index + 1 > gpu_count) {
1003
-
VK_ERROR(vk,
1004
-
"Attempted to force GPU index %d, but only %d "
1005
-
"GPUs are available",
1006
-
forced_index, gpu_count);
999
+
VK_ERROR(vk, "Attempted to force GPU index %d, but only %d GPUs are available", forced_index,
1000
+
gpu_count);
1007
1001
return VK_ERROR_DEVICE_LOST;
1008
1002
}
1009
1003
gpu_index = forced_index;
···
1146
1140
for (uint32_t i = 0; i < num_required_device_extensions; i++) {
1147
1141
const char *ext = required_device_extensions[i];
1148
1142
if (!vk_check_extension(vk, props, num_props, ext)) {
1149
-
U_LOG_E(
1150
-
"VkPhysicalDevice does not support required "
1151
-
"extension %s",
1152
-
ext);
1143
+
U_LOG_E("VkPhysicalDevice does not support required extension %s", ext);
1153
1144
free(props);
1154
1145
return false;
1155
1146
}
···
1383
1374
VkFormatFeatureFlags flag)
1384
1375
{
1385
1376
if ((format_features & flag) == 0) {
1386
-
U_LOG_E(
1387
-
"vk_swapchain_usage_flags: %s requested but %s not "
1388
-
"supported for format %s (%08x) (%08x)",
1389
-
xrt_swapchain_usage_string(usage), vk_format_feature_string(flag), vk_color_format_string(format),
1390
-
format_features, flag);
1377
+
U_LOG_E("vk_swapchain_usage_flags: %s requested but %s not supported for format %s (%08x) (%08x)",
1378
+
xrt_swapchain_usage_string(usage), vk_format_feature_string(flag),
1379
+
vk_color_format_string(format), format_features, flag);
1391
1380
return false;
1392
1381
}
1393
1382
return true;
···
1508
1497
VkMemoryRequirements requirements;
1509
1498
vk->vkGetBufferMemoryRequirements(vk->device, *out_buffer, &requirements);
1510
1499
1511
-
VkMemoryAllocateInfo alloc_info = {.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO,
1512
-
.allocationSize = requirements.size};
1500
+
VkMemoryAllocateInfo alloc_info = {
1501
+
.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO,
1502
+
.allocationSize = requirements.size,
1503
+
};
1513
1504
1514
1505
if (!vk_get_memory_type(vk, requirements.memoryTypeBits, properties, &alloc_info.memoryTypeIndex)) {
1515
1506
VK_ERROR(vk, "Failed to find matching memoryTypeIndex for buffer");