Add void* getNativeHandle() to everything except OpenGL logical devices, queues and swapchains

Author: devshgraphicsprogramming

src/nbl/video/CEGL.h renamed to include/nbl/video/CEGL.h

@@ -1,5 +1,5 @@
-#ifndef __NBL_C_EGL_H_INCLUDED__
-#define __NBL_C_EGL_H_INCLUDED__
+#ifndef _NBL_C_EGL_H_INCLUDED_
+#define _NBL_C_EGL_H_INCLUDED_
 
 //#include "nbl/video/CWaylandCaller.h"
 #include "nbl/video/CEGLCaller.h"

src/nbl/video/CEGLCaller.h renamed to include/nbl/video/CEGLCaller.h

@@ -1,5 +1,5 @@
-#ifndef __NBL_C_EGL_CALLER_H_INCLUDED__
-#define __NBL_C_EGL_CALLER_H_INCLUDED__
+#ifndef _NBL_C_EGL_CALLER_H_INCLUDED_
+#define _NBL_C_EGL_CALLER_H_INCLUDED_
 
 #include "EGL/egl.h"
 #include "nbl/system/DynamicFunctionCaller.h"
@@ -59,7 +59,6 @@ namespace nbl::video::egl
     eglWaitSync,\
     eglGetPlatformDependentHandles
 
-#define NBL_IMPL_GET_FUNC_PTR(FUNC_NAME) reinterpret_cast<void*>(&::FUNC_NAME)
 class CEGLLoader : public system::FuncPtrLoader
 {
         system::DefaultFuncPtrLoader m_libEGL;
@@ -84,56 +83,18 @@ class CEGLLoader : public system::FuncPtrLoader
         {
             if (m_libEGL.isLibraryLoaded())
                 return m_libEGL.loadFuncPtr(funcname);
+
+            #define NBL_IMPL_GET_FUNC_PTR(FUNC_NAME) reinterpret_cast<void*>(&::FUNC_NAME)
             #define LOAD_DYNLIB_FUNCPTR(FUNC_NAME) if (strcmp(funcname, #FUNC_NAME )==0) \
                 return NBL_IMPL_GET_FUNC_PTR(FUNC_NAME);
             NBL_FOREACH(LOAD_DYNLIB_FUNCPTR,NBL_EGL_FUNC_LIST)
             #undef LOAD_DYNLIB_FUNCPTR
+            #undef NBL_IMPL_GET_FUNC_PTR
             return nullptr;
         }
 };
 NBL_SYSTEM_DECLARE_DYNAMIC_FUNCTION_CALLER_CLASS(CEGLCaller,CEGLLoader,NBL_EGL_FUNC_LIST);
 
-/*
-class CEGLCaller final : public core::Uncopyable
-{
-
-
-
-
-    public:
-        #define NBL_IMPL_INIT_EGL_FUNCPTR(FUNC_NAME) ,p ## FUNC_NAME ( NBL_IMPL_GET_FUNC_PTR(FUNC_NAME) )
-        #define NBL_IMPL_INIT_EGL_FUNC_PTRS(...)\
-            NBL_FOREACH(NBL_IMPL_INIT_EGL_FUNCPTR,__VA_ARGS__)
-        CEGLCaller() : core::Uncopyable()
-            NBL_IMPL_INIT_EGL_FUNC_PTRS(NBL_EGL_FUNC_LIST)
-        {
-        }
-        #undef NBL_IMPL_INIT_EGL_FUNC_PTRS
-        #undef NBL_IMPL_INIT_EGL_FUNCPTR
-        #undef NBL_IMPL_GET_FUNC_PTR
-        CEGLCaller(CEGLCaller&& other)
-        {
-            operator=(std::move(other));
-        }
-
-        CEGLCaller& operator=(CEGLCaller&& other)
-        {
-            #define NBL_IMPL_SWAP_EGL_FUNC_PTRS(...)\
-                NBL_FOREACH(NBL_SYSTEM_IMPL_SWAP_DYNLIB_FUNCPTR,__VA_ARGS__);
-            NBL_IMPL_SWAP_EGL_FUNC_PTRS(NBL_EGL_FUNC_LIST);
-            #undef NBL_IMPL_SWAP_EGL_FUNC_PTRS
-
-            return *this;
-        }
-
-        #define NBL_IMPL_DECLARE_EGL_FUNC_PTRS(...)\
-            NBL_FOREACH(NBL_SYSTEM_DECLARE_DYNLIB_FUNCPTR,__VA_ARGS__);
-        NBL_IMPL_DECLARE_EGL_FUNC_PTRS(NBL_EGL_FUNC_LIST)
-        #undef NBL_IMPL_DECLARE_EGL_FUNC_PTRS
-
-};
-*/
-
 #undef NBL_EGL_FUNC_LIST
 }
 

include/nbl/video/COpenGL_Connection.h

@@ -1,10 +1,11 @@
-#ifndef __NBL_C_OPENGL__CONNECTION_H_INCLUDED__
-#define __NBL_C_OPENGL__CONNECTION_H_INCLUDED__
+#ifndef _NBL_C_OPENGL__CONNECTION_H_INCLUDED_
+#define _NBL_C_OPENGL__CONNECTION_H_INCLUDED_
 
 #include "nbl/system/ISystem.h"
 
 #include "nbl/video/IAPIConnection.h"
 #include "nbl/video/debug/COpenGLDebugCallback.h"
+#include "nbl/video/CEGL.h"
 
 namespace nbl::video
 {
@@ -13,6 +14,13 @@ template<E_API_TYPE API_TYPE>
 class COpenGL_Connection final : public IAPIConnection
 {
     public:
+        //
+        struct SStuff
+        {
+            // to load function pointers, make EGL context current and use `egl->call.peglGetProcAddress("glFuncname")`
+        };
+
+        //
         static core::smart_refctd_ptr<COpenGL_Connection<API_TYPE>> create(core::smart_refctd_ptr<system::ISystem>&& sys, uint32_t appVer, const char* appName, COpenGLDebugCallback&& dbgCb);
 
         E_API_TYPE getAPIType() const override
@@ -22,6 +30,8 @@ class COpenGL_Connection final : public IAPIConnection
 
         IDebugCallback* getDebugCallback() const override;
 
+        const egl::CEGL& getInternalObject() const;
+
     private:
         COpenGL_Connection() : IAPIConnection()
         {}

include/nbl/video/CThreadSafeGPUQueueAdapter.h

@@ -55,6 +55,11 @@ class CThreadSafeGPUQueueAdapter : public IGPUQueue
         {
             return originalQueue;
         }
+
+        virtual const void* getNativeHandle() const
+        {
+            return originalQueue->getNativeHandle();
+        }
 };
 
 }

include/nbl/video/IAPIConnection.h

@@ -15,6 +15,7 @@ class IPhysicalDevice;
 class IAPIConnection : public core::IReferenceCounted
 {
 public:
+    // TODO: are these "instance features" ?
     enum E_FEATURE
     {
         EF_SURFACE = 0,
@@ -30,6 +31,7 @@ class IAPIConnection : public core::IReferenceCounted
     static core::SRange<const E_FEATURE> getDependentFeatures(const E_FEATURE feature);
 
 protected:
+    // TODO: move to IAPIConnection.cpp
     inline IAPIConnection() : m_physicalDevices(), m_rdoc_api(nullptr)
     {
 #ifdef _NBL_PLATFORM_WINDOWS_

include/nbl/video/IGPUBuffer.h

@@ -41,6 +41,10 @@ class IGPUBuffer : public asset::IBuffer, public IDriverMemoryBacked, public IBa
 		inline uint64_t getSize() const override {return cachedMemoryReqs.vulkanReqs.size;}
 
 		inline const SCachedCreationParams& getCachedCreationParams() const {return m_cachedCreationParams;}
+
+		// OpenGL: const GLuint* handle of a Buffer
+		// Vulkan: const VkBuffer*
+		virtual const void* getNativeHandle() const = 0;
 
     protected:
         IGPUBuffer(

include/nbl/video/IGPUBufferView.h

@@ -24,6 +24,10 @@ class IGPUBufferView : public asset::IBufferView<IGPUBuffer>, public IBackendObj
         asset::IBufferView<IGPUBuffer>(std::move(_buffer), _format, _offset, _size), IBackendObject(std::move(dev))
     {}
 
+    // OpenGL: const GLuint* handle of GL_TEXTURE_BUFFER
+    // Vulkan: const VkBufferView*
+    virtual const void* getNativeHandle() const = 0;
+
 protected:
     virtual ~IGPUBufferView() = default;
 };

include/nbl/video/IGPUCommandBuffer.h

@@ -174,6 +174,10 @@ class IGPUCommandBuffer :
         return m_cachedInheritanceInfo;
     }
 
+    // OpenGL: nullptr, because commandbuffer doesn't exist in GL (we might expose the linked list command storage in the future)
+    // Vulkan: const VkCommandBuffer*
+    virtual const void* getNativeHandle() const = 0;
+
 protected:
     friend class IGPUQueue;
 

include/nbl/video/IGPUCommandPool.h

@@ -27,6 +27,10 @@ class IGPUCommandPool : public core::IReferenceCounted, public IBackendObject
         core::bitflag<E_CREATE_FLAGS> getCreationFlags() const { return m_flags; }
         uint32_t getQueueFamilyIndex() const { return m_familyIx; }
 
+        // OpenGL: nullptr, because commandpool doesn't exist in GL (we might expose the internal allocator in the future)
+        // Vulkan: const VkCommandPool*
+        virtual const void* getNativeHandle() const = 0;
+
     protected:
         virtual ~IGPUCommandPool() = default;
 

include/nbl/video/IGPUFence.h

@@ -30,6 +30,10 @@ class IGPUFence : public core::IReferenceCounted, public IBackendObject
         {
         }
 
+        // OpenGL: core::smart_refctd_ptr<COpenGLSync>*
+        // Vulkan: const VkFence*
+        virtual void* getNativeHandle() = 0;
+
     protected:
         virtual ~IGPUFence() = default;
 };