diff --git a/src/xrt/compositor/main/comp_compositor.c b/src/xrt/compositor/main/comp_compositor.c index 89ca0d499..1e1297021 100644 --- a/src/xrt/compositor/main/comp_compositor.c +++ b/src/xrt/compositor/main/comp_compositor.c @@ -696,17 +696,17 @@ compositor_init_vulkan(struct comp_compositor *c) .instance_extensions = { .array = NULL, // Filled in below - .num = 0, // Filled in below + .count = 0, // Filled in below }, .required_device_extensions = { .array = required_device_extensions, - .num = ARRAY_SIZE(required_device_extensions), + .count = ARRAY_SIZE(required_device_extensions), }, .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, .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}; - 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) { CVK_ERROR(c, "select_instances_extensions", "Failed to select instance extensions.", ret); return ret; diff --git a/src/xrt/compositor/util/comp_vulkan.c b/src/xrt/compositor/util/comp_vulkan.c index 803a0df63..c251cce4d 100644 --- a/src/xrt/compositor/util/comp_vulkan.c +++ b/src/xrt/compositor/util/comp_vulkan.c @@ -120,7 +120,7 @@ create_instance(struct vk_bundle *vk, const struct comp_vulkan_arguments *vk_arg VkInstanceCreateInfo instance_info = { .sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, .pApplicationInfo = &app_info, - .enabledExtensionCount = vk_args->instance_extensions.num, + .enabledExtensionCount = vk_args->instance_extensions.count, .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 prios[i], // global_priority 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.num, // + vk_args->optional_device_extensions.count, // &device_features); // optional_device_features // All ok! diff --git a/src/xrt/compositor/util/comp_vulkan.h b/src/xrt/compositor/util/comp_vulkan.h index ec6212c8d..304cf86cb 100644 --- a/src/xrt/compositor/util/comp_vulkan.h +++ b/src/xrt/compositor/util/comp_vulkan.h @@ -25,7 +25,7 @@ extern "C" { struct comp_vulkan_extension_list { const char **array; - uint32_t num; + uint32_t count; }; /*!