From c30c4c011d42f68f9cace1a0f5403ea826d8c23b Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@collabora.com>
Date: Tue, 15 Dec 2020 14:25:57 +0000
Subject: [PATCH] c/main: Silence warnings and make sure that layer configs are
 picked up

---
 doc/changes/compositor/mr.620.md          | 4 ++++
 src/xrt/compositor/main/comp_compositor.c | 6 ++++++
 src/xrt/compositor/main/comp_compositor.h | 1 +
 3 files changed, 11 insertions(+)

diff --git a/doc/changes/compositor/mr.620.md b/doc/changes/compositor/mr.620.md
index 877895900..a487bd041 100644
--- a/doc/changes/compositor/mr.620.md
+++ b/doc/changes/compositor/mr.620.md
@@ -1 +1,5 @@
+---
+- mr.620
+- mr.624
+---
 Implement support for XR_KHR_composition_layer_equirect (equirect1).
diff --git a/src/xrt/compositor/main/comp_compositor.c b/src/xrt/compositor/main/comp_compositor.c
index e2f32b2c2..540b9b89c 100644
--- a/src/xrt/compositor/main/comp_compositor.c
+++ b/src/xrt/compositor/main/comp_compositor.c
@@ -539,6 +539,12 @@ compositor_layer_commit(struct xrt_compositor *xc, int64_t frame_id)
 			image = &layer->scs[0]->images[eq->sub.image_index];
 			comp_renderer_set_equirect2_layer(c->r, i, image, data);
 		} break;
+#endif
+#ifndef XRT_FEATURE_OPENXR_LAYER_EQUIRECT1
+		case XRT_LAYER_EQUIRECT1:
+#endif
+#ifndef XRT_FEATURE_OPENXR_LAYER_EQUIRECT2
+		case XRT_LAYER_EQUIRECT2:
 #endif
 		case XRT_LAYER_CUBE:
 			// Should never end up here.
diff --git a/src/xrt/compositor/main/comp_compositor.h b/src/xrt/compositor/main/comp_compositor.h
index 3b014188a..0a7b090e0 100644
--- a/src/xrt/compositor/main/comp_compositor.h
+++ b/src/xrt/compositor/main/comp_compositor.h
@@ -11,6 +11,7 @@
 #pragma once
 
 #include "xrt/xrt_gfx_vk.h"
+#include "xrt/xrt_config_build.h"
 
 #include "util/u_threading.h"
 #include "util/u_index_fifo.h"