From dd0437920983a3d7acb397b7adb2cc9e59513cc3 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@collabora.com>
Date: Thu, 28 May 2020 21:44:26 +0100
Subject: [PATCH] st/oxr: Now that layers are supported up the max layers to
 what the spec requires

---
 doc/changes/state_trackers/mr.354.1.md  | 1 +
 src/xrt/state_trackers/oxr/oxr_system.c | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 doc/changes/state_trackers/mr.354.1.md

diff --git a/doc/changes/state_trackers/mr.354.1.md b/doc/changes/state_trackers/mr.354.1.md
new file mode 100644
index 000000000..3d67a2e73
--- /dev/null
+++ b/doc/changes/state_trackers/mr.354.1.md
@@ -0,0 +1 @@
+OpenXR: Report a spec following amount of maximum layers supported.
diff --git a/src/xrt/state_trackers/oxr/oxr_system.c b/src/xrt/state_trackers/oxr/oxr_system.c
index 21f044054..cc0fc863a 100644
--- a/src/xrt/state_trackers/oxr/oxr_system.c
+++ b/src/xrt/state_trackers/oxr/oxr_system.c
@@ -216,11 +216,10 @@ oxr_system_get_properties(struct oxr_logger *log,
 	snprintf(properties->systemName, XR_MAX_SYSTEM_NAME_SIZE,
 	         "Monado: %.*s", 247, sys->head->str);
 
-	/*!
-	 * @todo conforming implementations must support at
-	 * leastXR_MIN_COMPOSITION_LAYERS_SUPPORTED layers.
-	 */
-	properties->graphicsProperties.maxLayerCount = 1;
+	//! Get from compositor.
+	uint32_t max = XR_MIN_COMPOSITION_LAYERS_SUPPORTED;
+
+	properties->graphicsProperties.maxLayerCount = max;
 	properties->graphicsProperties.maxSwapchainImageWidth = 1024 * 16;
 	properties->graphicsProperties.maxSwapchainImageHeight = 1024 * 16;
 	properties->trackingProperties.orientationTracking = XR_TRUE;