Enabled OpenXR on GLES/Android

Author: TheMostDiligent

Graphics/GraphicsEngineOpenGL/include/GLContextAndroid.hpp

@@ -27,21 +27,26 @@
 
 #pragma once
 
+#include <memory>
+
 #include <EGL/egl.h>
 #include <android/native_window.h>
 
 namespace Diligent
 {
 
+struct EngineGLCreateInfo;
+struct OpenXRAttribs;
+
 class GLContext
 {
 public:
     using NativeGLContextType = EGLContext;
 
-    GLContext(const struct EngineGLCreateInfo& InitAttribs,
-              RENDER_DEVICE_TYPE&              DevType,
-              struct Version&                  APIVersion,
-              const struct SwapChainDesc*      pSCDesc);
+    GLContext(const EngineGLCreateInfo&   InitAttribs,
+              RENDER_DEVICE_TYPE&         DevType,
+              struct Version&             APIVersion,
+              const struct SwapChainDesc* pSCDesc);
     ~GLContext();
 
     bool Init(ANativeWindow* window);
@@ -68,6 +73,10 @@ class GLContext
     EGLContext     context_ = EGL_NO_CONTEXT;
     EGLConfig      config_;
 
+#if DILIGENT_USE_OPENXR
+    std::unique_ptr<OpenXRAttribs> openxr_attribs_;
+#endif
+
     EGLint egl_major_version_ = 0;
     EGLint egl_minor_version_ = 0;
 

Graphics/GraphicsEngineOpenGL/src/GLContextAndroid.cpp

@@ -32,6 +32,10 @@
 
 #include "GLContextAndroid.hpp"
 
+#if DILIGENT_USE_OPENXR
+#    include "OpenXR_GLHelpers.hpp"
+#endif
+
 #ifndef EGL_CONTEXT_MINOR_VERSION_KHR
 #    define EGL_CONTEXT_MINOR_VERSION_KHR 0x30FB
 #endif
@@ -150,6 +154,14 @@ bool GLContext::InitEGLSurface()
 
 bool GLContext::InitEGLContext()
 {
+#if DILIGENT_USE_OPENXR
+    Version OpenXRRequiredGLESVersion;
+    if (openxr_attribs_)
+    {
+        OpenXRRequiredGLESVersion = GetOpenXRRequiredGLVersion(openxr_attribs_.get());
+    }
+#endif
+
     std::pair<int, int> es_versions[] = {{3, 2}, {3, 1}, {3, 0}};
     for (size_t i = 0; i < _countof(es_versions) && context_ == EGL_NO_CONTEXT; ++i)
     {
@@ -192,6 +204,14 @@ bool GLContext::InitEGLContext()
         LOG_ERROR_AND_THROW("Failed to create EGLContext");
     }
 
+#if DILIGENT_USE_OPENXR
+    if (openxr_attribs_ && OpenXRRequiredGLESVersion > Version{static_cast<Uint32>(major_version_), static_cast<Uint32>(minor_version_)})
+    {
+        LOG_ERROR("OpenGLES version ", major_version_, '.', minor_version_, " does not meet minimum required version for OpenXR: ",
+                  OpenXRRequiredGLESVersion.Major, '.', OpenXRRequiredGLESVersion.Minor);
+    }
+#endif
+
     if (eglMakeCurrent(display_, surface_, surface_, context_) == EGL_FALSE)
     {
         LOG_ERROR_AND_THROW("Unable to eglMakeCurrent");
@@ -288,6 +308,13 @@ GLContext::GLContext(const EngineGLCreateInfo& InitAttribs,
     gles_initialized_(false),
     egl_context_initialized_(false)
 {
+#if DILIGENT_USE_OPENXR
+    if (InitAttribs.pXRAttribs != nullptr && InitAttribs.pXRAttribs->Instance != 0)
+    {
+        openxr_attribs_ = std::make_unique<OpenXRAttribs>(*InitAttribs.pXRAttribs);
+    }
+#endif
+
     auto* NativeWindow = reinterpret_cast<ANativeWindow*>(InitAttribs.Window.pAWindow);
     Init(NativeWindow);
 

ThirdParty/OpenXR-SDK/CMakeLists.txt

@@ -7,7 +7,6 @@ set(BUILD_TESTS OFF)
 set(BUILD_API_LAYERS ON)
 FetchContent_Declare(
     OpenXR
-    URL_HASH MD5=924a94a2da0b5ef8e82154c623d88644
     DOWNLOAD_EXTRACT_TIMESTAMP TRUE
     URL https://github.com/KhronosGroup/OpenXR-SDK-Source/archive/refs/tags/release-1.0.34.zip
 )