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

c/main: rename extensions num -> count

Browse source
This commit is contained in:
Christoph Haag 2021-12-06 00:08:35 +01:00
parent 13e3db6128
commit ee366e16e5
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -696,17 +696,17 @@ compositor_init_vulkan(struct comp_compositor *c)
.instance_extensions = .instance_extensions =
{ {
.array = NULL, // Filled in below .array = NULL, // Filled in below
.num = 0, // Filled in below .count = 0, // Filled in below
}, },
.required_device_extensions = .required_device_extensions =
{ {
.array = required_device_extensions, .array = required_device_extensions,
.num = ARRAY_SIZE(required_device_extensions), .count = ARRAY_SIZE(required_device_extensions),
}, },
.optional_device_extensions = .optional_device_extensions =
{ {
.array = optional_device_extensions, .array = optional_device_extensions,
.num = ARRAY_SIZE(optional_device_extensions), .count = ARRAY_SIZE(optional_device_extensions),
}, },
.log_level = c->settings.log_level, .log_level = c->settings.log_level,
.only_compute_queue = c->settings.use_compute, .only_compute_queue = c->settings.use_compute,
@ -716,7 +716,7 @@ compositor_init_vulkan(struct comp_compositor *c)
struct comp_vulkan_results vk_res = {0}; struct comp_vulkan_results vk_res = {0};
ret = select_instances_extensions(c, &vk_args.instance_extensions.array, &vk_args.instance_extensions.num); ret = select_instances_extensions(c, &vk_args.instance_extensions.array, &vk_args.instance_extensions.count);
if (ret != VK_SUCCESS) { if (ret != VK_SUCCESS) {
CVK_ERROR(c, "select_instances_extensions", "Failed to select instance extensions.", ret); CVK_ERROR(c, "select_instances_extensions", "Failed to select instance extensions.", ret);
return ret; return ret;

6
src/xrt/compositor/util/comp_vulkan.c
View file

@ -120,7 +120,7 @@ create_instance(struct vk_bundle *vk, const struct comp_vulkan_arguments *vk_arg
VkInstanceCreateInfo instance_info = { VkInstanceCreateInfo instance_info = {
.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, .sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,
.pApplicationInfo = &app_info, .pApplicationInfo = &app_info,
.enabledExtensionCount = vk_args->instance_extensions.num, .enabledExtensionCount = vk_args->instance_extensions.count,
.ppEnabledExtensionNames = vk_args->instance_extensions.array, .ppEnabledExtensionNames = vk_args->instance_extensions.array,
}; };
@ -172,9 +172,9 @@ create_device(struct vk_bundle *vk, const struct comp_vulkan_arguments *vk_args)
only_compute_queue, // compute_only only_compute_queue, // compute_only
prios[i], // global_priority prios[i], // global_priority
vk_args->required_device_extensions.array, // vk_args->required_device_extensions.array, //
vk_args->required_device_extensions.num, // vk_args->required_device_extensions.count, //
vk_args->optional_device_extensions.array, // vk_args->optional_device_extensions.array, //
vk_args->optional_device_extensions.num, // vk_args->optional_device_extensions.count, //
&device_features); // optional_device_features &device_features); // optional_device_features
// All ok! // All ok!

2
src/xrt/compositor/util/comp_vulkan.h
View file

@ -25,7 +25,7 @@ extern "C" {
struct comp_vulkan_extension_list struct comp_vulkan_extension_list
{ {
const char **array; const char **array;
uint32_t num; uint32_t count;
}; };
/*! /*!