diff --git a/src/xrt/auxiliary/vk/vk_bundle_init.c b/src/xrt/auxiliary/vk/vk_bundle_init.c
index ff6bdab0e..823990fa6 100644
--- a/src/xrt/auxiliary/vk/vk_bundle_init.c
+++ b/src/xrt/auxiliary/vk/vk_bundle_init.c
@@ -241,8 +241,8 @@ fill_in_device_features(struct vk_bundle *vk, const uint32_t queue_family_index)
 
 	vk->features.timestamp_compute_and_graphics = pdp.limits.timestampComputeAndGraphics;
 	vk->features.timestamp_period = pdp.limits.timestampPeriod;
-	vk->features.max_per_stage_descriptor_sampled_images = pdp.limits.maxPerStageDescriptorSampledImages;
-	vk->features.max_per_stage_descriptor_storage_images = pdp.limits.maxPerStageDescriptorStorageImages;
+	vk->limits.max_per_stage_descriptor_sampled_images = pdp.limits.maxPerStageDescriptorSampledImages;
+	vk->limits.max_per_stage_descriptor_storage_images = pdp.limits.maxPerStageDescriptorStorageImages;
 
 
 	/*
diff --git a/src/xrt/auxiliary/vk/vk_helpers.h b/src/xrt/auxiliary/vk/vk_helpers.h
index f73bbb342..80f3d1b5a 100644
--- a/src/xrt/auxiliary/vk/vk_helpers.h
+++ b/src/xrt/auxiliary/vk/vk_helpers.h
@@ -200,12 +200,6 @@ struct vk_bundle
 		//! Were timeline semaphore requested, available, and enabled?
 		bool timeline_semaphore;
 
-		//! Per stage limit on sampled images (includes combined).
-		uint32_t max_per_stage_descriptor_sampled_images;
-
-		//! Per stage limit on storage images.
-		uint32_t max_per_stage_descriptor_storage_images;
-
 		//! Was synchronization2 requested, available, and enabled?
 		bool synchronization_2;
 
@@ -216,6 +210,15 @@ struct vk_bundle
 		bool video_maintenance_1;
 	} features;
 
+	struct
+	{
+		//! Per stage limit on sampled images (includes combined).
+		uint32_t max_per_stage_descriptor_sampled_images;
+
+		//! Per stage limit on storage images.
+		uint32_t max_per_stage_descriptor_storage_images;
+	} limits;
+
 	//! Is the GPU a tegra device.
 	bool is_tegra;
 
diff --git a/src/xrt/compositor/render/render_resources.c b/src/xrt/compositor/render/render_resources.c
index dad419006..d28caaed8 100644
--- a/src/xrt/compositor/render/render_resources.c
+++ b/src/xrt/compositor/render/render_resources.c
@@ -543,7 +543,7 @@ render_resources_init(struct render_resources *r,
 	r->compute.ubo_binding = 3;
 
 	r->compute.layer.image_array_size =
-	    MIN(vk->features.max_per_stage_descriptor_sampled_images, RENDER_MAX_IMAGES_SIZE);
+	    MIN(vk->limits.max_per_stage_descriptor_sampled_images, RENDER_MAX_IMAGES_SIZE);
 
 
 	/*