From 7aa0fbb89fc6b20950b79808ebb0f145e8d1212e Mon Sep 17 00:00:00 2001
From: HifiExperiments <thingsandstuffblog@gmail.com>
Date: Fri, 9 Aug 2024 20:12:12 -0700
Subject: [PATCH] OpenXr: Platform improvements.

Add missing includes on Windows.
Include GLX only on Linux.

Move openxr_platform.h include to OpenXrContext.h. To make this
possible, certain names from GLX/X11 need to be undefined in order to be
now includable in OpenXrInput.h.

Add Overte e.V. copyright.

Co-authored-by: Lubosz Sarnecki <lubosz@gmail.com>
---
 plugins/openxr/CMakeLists.txt              |  1 +
 plugins/openxr/src/OpenXrContext.cpp       | 14 +-----------
 plugins/openxr/src/OpenXrContext.h         | 25 +++++++++++++++++++++-
 plugins/openxr/src/OpenXrDisplayPlugin.cpp |  8 ++++++-
 plugins/openxr/src/OpenXrDisplayPlugin.h   | 10 +--------
 plugins/openxr/src/OpenXrInputPlugin.cpp   |  1 +
 plugins/openxr/src/OpenXrInputPlugin.h     |  1 +
 plugins/openxr/src/OpenXrProvider.cpp      |  1 +
 8 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/plugins/openxr/CMakeLists.txt b/plugins/openxr/CMakeLists.txt
index c54d5efcc2..847a41880e 100644
--- a/plugins/openxr/CMakeLists.txt
+++ b/plugins/openxr/CMakeLists.txt
@@ -1,5 +1,6 @@
 #
 # Copyright 2024 Lubosz Sarnecki
+# Copyright 2024 Overte e.V.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/plugins/openxr/src/OpenXrContext.cpp b/plugins/openxr/src/OpenXrContext.cpp
index 127ab7ae9a..2664b49bcf 100644
--- a/plugins/openxr/src/OpenXrContext.cpp
+++ b/plugins/openxr/src/OpenXrContext.cpp
@@ -2,6 +2,7 @@
 // Overte OpenXR Plugin
 //
 // Copyright 2024 Lubosz Sarnecki
+// Copyright 2024 Overte e.V.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -11,19 +12,6 @@
 
 #include <sstream>
 
-#if defined(Q_OS_LINUX)
-  #include <GL/glx.h>
-  #define XR_USE_PLATFORM_XLIB
-#elif defined(Q_OS_WIN)
-  #define XR_USE_PLATFORM_WIN32
-#else
-  #error "Unsupported platform"
-#endif
-
-#define XR_USE_GRAPHICS_API_OPENGL
-#include <openxr/openxr.h>
-#include <openxr/openxr_platform.h>
-
 Q_DECLARE_LOGGING_CATEGORY(xr_context_cat)
 Q_LOGGING_CATEGORY(xr_context_cat, "openxr.context")
 
diff --git a/plugins/openxr/src/OpenXrContext.h b/plugins/openxr/src/OpenXrContext.h
index 387bab388e..eed18eeeb8 100644
--- a/plugins/openxr/src/OpenXrContext.h
+++ b/plugins/openxr/src/OpenXrContext.h
@@ -2,19 +2,42 @@
 // Overte OpenXR Plugin
 //
 // Copyright 2024 Lubosz Sarnecki
+// Copyright 2024 Overte e.V.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
 
 #pragma once
 
-#include "controllers/Pose.h"
 
 #include <openxr/openxr.h>
 
+#include "gpu/gl/GLBackend.h"
+
+#if defined(Q_OS_LINUX)
+    #define XR_USE_PLATFORM_XLIB
+    #include <GL/glx.h>
+    // Unsorted from glx.h conflicts with qdir.h
+    #undef Unsorted
+    // MappingPointer from X11 conflicts with one from controllers/Forward.h
+    #undef MappingPointer
+#elif defined(Q_OS_WIN)
+    #define XR_USE_PLATFORM_WIN32
+    #include <Unknwn.h>
+    #include <Windows.h>
+#else
+    #error "Unimplemented platform"
+#endif
+
+
+#define XR_USE_GRAPHICS_API_OPENGL
+#include <openxr/openxr_platform.h>
+
 #include <glm/glm.hpp>
 #include <glm/gtx/quaternion.hpp>
 
+#include "controllers/Pose.h"
+
 #define HAND_COUNT 2
 
 constexpr XrPosef XR_INDENTITY_POSE = {
diff --git a/plugins/openxr/src/OpenXrDisplayPlugin.cpp b/plugins/openxr/src/OpenXrDisplayPlugin.cpp
index e15de872dd..fd9177143a 100644
--- a/plugins/openxr/src/OpenXrDisplayPlugin.cpp
+++ b/plugins/openxr/src/OpenXrDisplayPlugin.cpp
@@ -2,6 +2,7 @@
 // Overte OpenXR Plugin
 //
 // Copyright 2024 Lubosz Sarnecki
+// Copyright 2024 Overte e.V.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -16,6 +17,11 @@
 #include <glm/gtx/transform.hpp>
 #include <thread>
 
+#if defined(Q_OS_WIN)
+#undef near
+#undef far
+#endif
+
 Q_DECLARE_LOGGING_CATEGORY(xr_display_cat)
 Q_LOGGING_CATEGORY(xr_display_cat, "openxr.display")
 
@@ -264,7 +270,7 @@ void OpenXrDisplayPlugin::internalDeactivate() {
     // We can get into a state where activate -> deactivate -> activate is called in a chain.
     // We are probably gonna have a bad time then. At least check if the session is already running.
     // This happens when the application decides to switch display plugins back and forth. This should
-    // prbably be fixed there.
+    // probably be fixed there.
     if (_context->_isSessionRunning) {
         if (!_context->requestExitSession()) {
             qCCritical(xr_display_cat, "Failed to request exit session");
diff --git a/plugins/openxr/src/OpenXrDisplayPlugin.h b/plugins/openxr/src/OpenXrDisplayPlugin.h
index e36dba44f5..ac83c8e094 100644
--- a/plugins/openxr/src/OpenXrDisplayPlugin.h
+++ b/plugins/openxr/src/OpenXrDisplayPlugin.h
@@ -2,6 +2,7 @@
 // Overte OpenXR Plugin
 //
 // Copyright 2024 Lubosz Sarnecki
+// Copyright 2024 Overte e.V.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -13,15 +14,6 @@
 
 #include "OpenXrContext.h"
 
-#include "gpu/gl/GLBackend.h"
-
-#include <GL/glx.h>
-
-#define XR_USE_PLATFORM_XLIB
-#define XR_USE_GRAPHICS_API_OPENGL
-#include <openxr/openxr.h>
-#include <openxr/openxr_platform.h>
-
 class OpenXrDisplayPlugin : public HmdDisplayPlugin {
 public:
     OpenXrDisplayPlugin(std::shared_ptr<OpenXrContext> c);
diff --git a/plugins/openxr/src/OpenXrInputPlugin.cpp b/plugins/openxr/src/OpenXrInputPlugin.cpp
index 04582ae92f..c16581efb5 100644
--- a/plugins/openxr/src/OpenXrInputPlugin.cpp
+++ b/plugins/openxr/src/OpenXrInputPlugin.cpp
@@ -2,6 +2,7 @@
 // Overte OpenXR Plugin
 //
 // Copyright 2024 Lubosz Sarnecki
+// Copyright 2024 Overte e.V.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
diff --git a/plugins/openxr/src/OpenXrInputPlugin.h b/plugins/openxr/src/OpenXrInputPlugin.h
index f1a578867d..a3c29794e0 100644
--- a/plugins/openxr/src/OpenXrInputPlugin.h
+++ b/plugins/openxr/src/OpenXrInputPlugin.h
@@ -2,6 +2,7 @@
 // Overte OpenXR Plugin
 //
 // Copyright 2024 Lubosz Sarnecki
+// Copyright 2024 Overte e.V.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
diff --git a/plugins/openxr/src/OpenXrProvider.cpp b/plugins/openxr/src/OpenXrProvider.cpp
index c2a87dff67..ba23a882cb 100644
--- a/plugins/openxr/src/OpenXrProvider.cpp
+++ b/plugins/openxr/src/OpenXrProvider.cpp
@@ -2,6 +2,7 @@
 // Overte OpenXR Plugin
 //
 // Copyright 2024 Lubosz Sarnecki
+// Copyright 2024 Overte e.V.
 //
 // SPDX-License-Identifier: Apache-2.0
 //