The open source OpenXR runtime

a/vk: move vulkan limits into dedicated vulkan anonymous-struct

Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2639>

Changed files
+12 -9
src
xrt
auxiliary
compositor
+2 -2
src/xrt/auxiliary/vk/vk_bundle_init.c
··· 241 241 242 242 vk->features.timestamp_compute_and_graphics = pdp.limits.timestampComputeAndGraphics; 243 243 vk->features.timestamp_period = pdp.limits.timestampPeriod; 244 - vk->features.max_per_stage_descriptor_sampled_images = pdp.limits.maxPerStageDescriptorSampledImages; 245 - vk->features.max_per_stage_descriptor_storage_images = pdp.limits.maxPerStageDescriptorStorageImages; 244 + vk->limits.max_per_stage_descriptor_sampled_images = pdp.limits.maxPerStageDescriptorSampledImages; 245 + vk->limits.max_per_stage_descriptor_storage_images = pdp.limits.maxPerStageDescriptorStorageImages; 246 246 247 247 248 248 /*
+9 -6
src/xrt/auxiliary/vk/vk_helpers.h
··· 200 200 //! Were timeline semaphore requested, available, and enabled? 201 201 bool timeline_semaphore; 202 202 203 - //! Per stage limit on sampled images (includes combined). 204 - uint32_t max_per_stage_descriptor_sampled_images; 205 - 206 - //! Per stage limit on storage images. 207 - uint32_t max_per_stage_descriptor_storage_images; 208 - 209 203 //! Was synchronization2 requested, available, and enabled? 210 204 bool synchronization_2; 211 205 ··· 215 209 //! Was KHR_video_maintenance1 requested, available, and enabled? 216 210 bool video_maintenance_1; 217 211 } features; 212 + 213 + struct 214 + { 215 + //! Per stage limit on sampled images (includes combined). 216 + uint32_t max_per_stage_descriptor_sampled_images; 217 + 218 + //! Per stage limit on storage images. 219 + uint32_t max_per_stage_descriptor_storage_images; 220 + } limits; 218 221 219 222 //! Is the GPU a tegra device. 220 223 bool is_tegra;
+1 -1
src/xrt/compositor/render/render_resources.c
··· 543 543 r->compute.ubo_binding = 3; 544 544 545 545 r->compute.layer.image_array_size = 546 - MIN(vk->features.max_per_stage_descriptor_sampled_images, RENDER_MAX_IMAGES_SIZE); 546 + MIN(vk->limits.max_per_stage_descriptor_sampled_images, RENDER_MAX_IMAGES_SIZE); 547 547 548 548 549 549 /*