OpenXRUtils: implemented GetOpenXRGraphicsBindingGL on Win32

DiligentGraphics · Dec 9, 2024 · 6c08410 · 6c08410
1 parent 192ad3e
commit 6c08410
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 8 deletions.
diff --git a/Graphics/GraphicsEngineOpenGL/include/GLContextWindows.hpp b/Graphics/GraphicsEngineOpenGL/include/GLContextWindows.hpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2022 Diligent Graphics LLC
+ *  Copyright 2019-2024 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -44,6 +44,9 @@ class GLContext
 
     NativeGLContextType GetCurrentNativeGLContext();
 
+    HGLRC GetHandle() const { return m_Context; }
+    HDC   GetWindowHandleToDeviceContext() const { return m_WindowHandleToDeviceContext; }
+
 private:
     HGLRC m_Context                     = NULL;
     HDC   m_WindowHandleToDeviceContext = NULL;

diff --git a/Graphics/GraphicsEngineOpenGL/include/GLProgramCache.hpp b/Graphics/GraphicsEngineOpenGL/include/GLProgramCache.hpp
@@ -32,12 +32,12 @@
 #include <vector>
 
 #include "GraphicsTypesX.hpp"
-#include "GLProgram.hpp"
 
 namespace Diligent
 {
 
 class ShaderGLImpl;
+class GLProgram;
 
 /// Program cached contains linked programs for the given combination of shaders and resource layouts.
 class GLProgramCache

diff --git a/Graphics/GraphicsEngineOpenGL/include/RenderDeviceGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/RenderDeviceGLImpl.hpp
@@ -32,21 +32,26 @@
 #include "EngineGLImplTraits.hpp"
 #include "RenderDeviceBase.hpp"
 #include "GLContext.hpp"
-#include "VAOCache.hpp"
 #include "BaseInterfacesGL.h"
-#include "FBOCache.hpp"
 #include "GLProgramCache.hpp"
 
 namespace Diligent
 {
 
+class VAOCache;
+class FBOCache;
+
 /// Render device implementation in OpenGL backend.
 // RenderDeviceGLESImpl is inherited from RenderDeviceGLImpl
 class RenderDeviceGLImpl : public RenderDeviceBase<EngineGLImplTraits>
 {
 public:
     using TRenderDeviceBase = RenderDeviceBase<EngineGLImplTraits>;
 
+    // {5CC1BE12-9E35-46AB-8B6C-D8544D1DD5E0}
+    static DILIGENT_CONSTEXPR INTERFACE_ID IID_RenderDeviceGLImpl =
+        {0x5cc1be12, 0x9e35, 0x46ab, {0x8b, 0x6c, 0xd8, 0x54, 0x4d, 0x1d, 0xd5, 0xe0}};
+
     RenderDeviceGLImpl(IReferenceCounters*       pRefCounters,
                        IMemoryAllocator&         RawMemAllocator,
                        IEngineFactory*           pEngineFactory,
@@ -190,6 +195,8 @@ class RenderDeviceGLImpl : public RenderDeviceBase<EngineGLImplTraits>
                                                                                   RESOURCE_DIMENSION Dimension,
                                                                                   Uint32             SampleCount) const override final;
 
+    const GLContext& GetContext() const { return m_GLContext; }
+
     FBOCache& GetFBOCache(GLContext::NativeGLContextType Context);
     void      OnReleaseTexture(ITexture* pTexture);
 

diff --git a/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp
@@ -52,6 +52,7 @@
 
 #include "GLTypeConversions.hpp"
 #include "VAOCache.hpp"
+#include "FBOCache.hpp"
 #include "GraphicsAccessories.hpp"
 
 

diff --git a/Graphics/GraphicsEngineOpenGL/src/GLProgramCache.cpp b/Graphics/GraphicsEngineOpenGL/src/GLProgramCache.cpp
@@ -31,6 +31,8 @@
 #include "RenderDeviceGLImpl.hpp"
 #include "PipelineResourceSignatureGLImpl.hpp"
 #include "HashUtils.hpp"
+#include "GLProgram.hpp"
+
 
 namespace Diligent
 {

diff --git a/Graphics/GraphicsEngineOpenGL/src/RenderDeviceGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/RenderDeviceGLImpl.cpp
@@ -50,6 +50,7 @@
 
 #include "GLTypeConversions.hpp"
 #include "VAOCache.hpp"
+#include "FBOCache.hpp"
 #include "EngineMemory.h"
 #include "StringTools.hpp"
 
@@ -354,7 +355,7 @@ RenderDeviceGLImpl::~RenderDeviceGLImpl()
 {
 }
 
-IMPLEMENT_QUERY_INTERFACE(RenderDeviceGLImpl, IID_RenderDeviceGL, TRenderDeviceBase)
+IMPLEMENT_QUERY_INTERFACE2(RenderDeviceGLImpl, IID_RenderDeviceGL, IID_RenderDeviceGLImpl, TRenderDeviceBase)
 
 void RenderDeviceGLImpl::CreateBuffer(const BufferDesc& BuffDesc, const BufferData* pBuffData, IBuffer** ppBuffer, bool bIsDeviceInternal)
 {

diff --git a/Graphics/GraphicsEngineOpenGL/src/TextureBaseGL.cpp b/Graphics/GraphicsEngineOpenGL/src/TextureBaseGL.cpp
@@ -34,6 +34,7 @@
 #include "TextureViewGLImpl.hpp"
 
 #include "GLTypeConversions.hpp"
+#include "FBOCache.hpp"
 #include "EngineMemory.h"
 #include "GraphicsAccessories.hpp"
 #include "Align.hpp"

diff --git a/Graphics/GraphicsTools/src/OpenXRUtilitiesGL.cpp b/Graphics/GraphicsTools/src/OpenXRUtilitiesGL.cpp
@@ -29,8 +29,25 @@
 #include "DebugUtilities.hpp"
 #include "DataBlobImpl.hpp"
 
+typedef unsigned int GLuint;
+typedef int          GLint;
+typedef unsigned int GLenum;
+
 #if GL_SUPPORTED
 
+#    if PLATFORM_WIN32
+
+#        include "WinHPreface.h"
+#        include <Windows.h>
+#        include <Unknwn.h>
+#        include "WinHPostface.h"
+
+#        include "../../GraphicsEngineOpenGL/include/RenderDeviceGLImpl.hpp"
+#        include "../../GraphicsEngineOpenGL/include/GLContextWindows.hpp"
+
+#        define XR_USE_PLATFORM_WIN32
+#    endif
+
 #    define XR_USE_GRAPHICS_API_OPENGL
 #    include <openxr/openxr_platform.h>
 
@@ -39,8 +56,6 @@ constexpr XrStructureType XR_TYPE_SWAPCHAIN_IMAGE_GL = XR_TYPE_SWAPCHAIN_IMAGE_O
 
 #elif GLES_SUPPORTED
 
-typedef unsigned int EGLenum;
-
 #    define XR_USE_GRAPHICS_API_OPENGL_ES
 #    include <openxr/openxr_platform.h>
 
@@ -60,7 +75,22 @@ void GetOpenXRGraphicsBindingGL(IRenderDevice*  pDevice,
                                 IDeviceContext* pContext,
                                 IDataBlob**     ppGraphicsBinding)
 {
-    UNSUPPORTED("Not yet implemented");
+#if GL_SUPPORTED && PLATFORM_WIN32
+    RefCntAutoPtr<DataBlobImpl> pDataBlob{DataBlobImpl::Create(sizeof(XrGraphicsBindingOpenGLWin32KHR))};
+
+    RefCntAutoPtr<RenderDeviceGLImpl> pDeviceGL{pDevice, RenderDeviceGLImpl::IID_RenderDeviceGLImpl};
+    VERIFY_EXPR(pDeviceGL != nullptr);
+
+    XrGraphicsBindingOpenGLWin32KHR& Binding = *reinterpret_cast<XrGraphicsBindingOpenGLWin32KHR*>(pDataBlob->GetDataPtr());
+    Binding.type                             = XR_TYPE_GRAPHICS_BINDING_D3D11_KHR;
+    Binding.next                             = nullptr;
+    Binding.hDC                              = pDeviceGL->GetContext().GetWindowHandleToDeviceContext();
+    Binding.hGLRC                            = pDeviceGL->GetContext().GetHandle();
+
+    *ppGraphicsBinding = pDataBlob.Detach();
+#else
+    UNEXPECTED("OpenXR GL bindings are not supported on this platform. The application should initialize the bindings manually.");
+#endif
 }
 
 void AllocateOpenXRSwapchainImageDataGL(Uint32      ImageCount,