From d24375f8abf878d18729dea12f5d1f612c340311 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@collabora.com>
Date: Mon, 18 Apr 2022 17:36:09 +0100
Subject: [PATCH] st/oxr: Tidy order of extensions (NFC)

---
 scripts/generate_oxr_ext_support.py           |  4 +--
 .../oxr/oxr_extension_support.h               | 26 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/scripts/generate_oxr_ext_support.py b/scripts/generate_oxr_ext_support.py
index f7bad3874..8381ffe58 100755
--- a/scripts/generate_oxr_ext_support.py
+++ b/scripts/generate_oxr_ext_support.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2019, Collabora, Ltd.
+# Copyright 2019-2022, Collabora, Ltd.
 # SPDX-License-Identifier: BSL-1.0
 """Simple script to update oxr_extension_support.h."""
 
@@ -17,8 +17,8 @@ EXTENSIONS = (
     ['XR_KHR_composition_layer_equirect', 'XRT_FEATURE_OPENXR_LAYER_EQUIRECT1'],
     ['XR_KHR_composition_layer_equirect2', 'XRT_FEATURE_OPENXR_LAYER_EQUIRECT2'],
     ['XR_KHR_convert_timespec_time', 'XR_USE_TIMESPEC'],
-    ['XR_KHR_loader_init_android', 'OXR_HAVE_KHR_loader_init', 'XR_USE_PLATFORM_ANDROID'],
     ['XR_KHR_loader_init', 'XR_USE_PLATFORM_ANDROID'],
+    ['XR_KHR_loader_init_android', 'OXR_HAVE_KHR_loader_init', 'XR_USE_PLATFORM_ANDROID'],
     ['XR_KHR_opengl_enable', 'XR_USE_GRAPHICS_API_OPENGL'],
     ['XR_KHR_opengl_es_enable', 'XR_USE_GRAPHICS_API_OPENGL_ES'],
     ['XR_KHR_swapchain_usage_input_attachment_bit'],
diff --git a/src/xrt/state_trackers/oxr/oxr_extension_support.h b/src/xrt/state_trackers/oxr/oxr_extension_support.h
index 80c7a43ad..29071515f 100644
--- a/src/xrt/state_trackers/oxr/oxr_extension_support.h
+++ b/src/xrt/state_trackers/oxr/oxr_extension_support.h
@@ -1,4 +1,4 @@
-// Copyright 2019, Collabora, Ltd.
+// Copyright 2019-2022, Collabora, Ltd.
 // SPDX-License-Identifier: BSL-1.0
 /*!
  * @file
@@ -100,17 +100,6 @@
 #endif
 
 
-/*
- * XR_KHR_loader_init_android
- */
-#if defined(XR_KHR_loader_init_android) && defined(OXR_HAVE_KHR_loader_init) && defined(XR_USE_PLATFORM_ANDROID)
-#define OXR_HAVE_KHR_loader_init_android
-#define OXR_EXTENSION_SUPPORT_KHR_loader_init_android(_) _(KHR_loader_init_android, KHR_LOADER_INIT_ANDROID)
-#else
-#define OXR_EXTENSION_SUPPORT_KHR_loader_init_android(_)
-#endif
-
-
 /*
  * XR_KHR_loader_init
  */
@@ -122,6 +111,17 @@
 #endif
 
 
+/*
+ * XR_KHR_loader_init_android
+ */
+#if defined(XR_KHR_loader_init_android) && defined(OXR_HAVE_KHR_loader_init) && defined(XR_USE_PLATFORM_ANDROID)
+#define OXR_HAVE_KHR_loader_init_android
+#define OXR_EXTENSION_SUPPORT_KHR_loader_init_android(_) _(KHR_loader_init_android, KHR_LOADER_INIT_ANDROID)
+#else
+#define OXR_EXTENSION_SUPPORT_KHR_loader_init_android(_)
+#endif
+
+
 /*
  * XR_KHR_opengl_enable
  */
@@ -298,8 +298,8 @@
     OXR_EXTENSION_SUPPORT_KHR_composition_layer_equirect(_) \
     OXR_EXTENSION_SUPPORT_KHR_composition_layer_equirect2(_) \
     OXR_EXTENSION_SUPPORT_KHR_convert_timespec_time(_) \
-    OXR_EXTENSION_SUPPORT_KHR_loader_init_android(_) \
     OXR_EXTENSION_SUPPORT_KHR_loader_init(_) \
+    OXR_EXTENSION_SUPPORT_KHR_loader_init_android(_) \
     OXR_EXTENSION_SUPPORT_KHR_opengl_enable(_) \
     OXR_EXTENSION_SUPPORT_KHR_opengl_es_enable(_) \
     OXR_EXTENSION_SUPPORT_KHR_swapchain_usage_input_attachment_bit(_) \