Merge remote-tracking branch 'origin/master'

Author: TheMostDiligent

Graphics/GraphicsEngineOpenGL/CMakeLists.txt

@@ -39,6 +39,7 @@ set(INTERFACE
 	interface/BufferGL.h
 	interface/BufferViewGL.h
 	interface/DeviceContextGL.h
+	interface/EngineGLAttribs.h
 	interface/PipelineStateGL.h
 	interface/RenderDeviceFactoryOpenGL.h
 	interface/RenderDeviceGL.h

Graphics/GraphicsEngineOpenGL/include/DeviceContextGLImpl.h

@@ -27,6 +27,7 @@
 #include "DeviceContextBase.h"
 #include "BaseInterfacesGL.h"
 #include "GLContextState.h"
+#include "GLObjectWrapper.h"
 
 namespace Diligent
 {
@@ -100,6 +101,7 @@ class DeviceContextGLImpl : public DeviceContextBase<IDeviceContextGL>
     std::vector<class BufferGLImpl*> m_BoundWritableBuffers;
 
     bool m_bVAOIsUpToDate = false;
+    GLObjectWrappers::GLFrameBufferObj m_DefaultFBO;
 };
 
 }

Graphics/GraphicsEngineOpenGL/include/GLContextAndroid.h

@@ -28,18 +28,12 @@
 
 namespace Diligent
 {
-    struct ContextInitInfo
-    {
-        SwapChainDesc SwapChainAttribs;
-        void *pNativeWndHandle = nullptr;
-    };
-
     class GLContext
     {
     public:
         typedef EGLContext NativeGLContextType;
 
-        GLContext( const ContextInitInfo &Info, DeviceCaps &DeviceCaps );
+        GLContext( const struct EngineGLAttribs &InitAttribs, DeviceCaps &DeviceCaps );
         ~GLContext();
 
         bool Init( ANativeWindow* window );
@@ -51,9 +45,9 @@ namespace Diligent
         void Suspend();
         EGLint Resume( ANativeWindow* window );
 
-        const SwapChainDesc& GetSwapChainDesc()const{ return SwapChainAttribs_; }
-        
         NativeGLContextType GetCurrentNativeGLContext();
+        int32_t GetScreenWidth()const{return screen_width_;}
+        int32_t GetScreenHeight()const{return screen_height_;}
 
     private:
         //EGL configurations
@@ -68,6 +62,8 @@ namespace Diligent
         int32_t depth_size_ = 0;
         int32_t major_version_ = 0;
         int32_t minor_version_ = 0;
+        int32_t screen_width_ = 0;
+        int32_t screen_height_ = 0;
 
         //Flags
         bool gles_initialized_ = false;

Graphics/GraphicsEngineOpenGL/include/GLContextLinux.h

@@ -25,31 +25,20 @@
 
 namespace Diligent
 {
-
-    struct ContextInitInfo
-    {
-        SwapChainDesc SwapChainAttribs;
-        void *pNativeWndHandle = nullptr;
-        void *pDisplay = nullptr;
-    };
-
     class GLContext
     {
     public:
         typedef GLXContext NativeGLContextType;
 
-        GLContext(const ContextInitInfo &Info, struct DeviceCaps &DeviceCaps);
+        GLContext(const struct EngineGLAttribs &InitAttribs, struct DeviceCaps &DeviceCaps);
         ~GLContext();
         void SwapBuffers();
 
-        const SwapChainDesc& GetSwapChainDesc()const{ return m_SwapChainAttribs; }
-
         NativeGLContextType GetCurrentNativeGLContext();
 
     private:
         void *m_pNativeWindow = nullptr;
         void *m_pDisplay = nullptr;
         NativeGLContextType m_Context;
-        SwapChainDesc m_SwapChainAttribs;
     };
 }

Graphics/GraphicsEngineOpenGL/include/GLContextMacOS.h

@@ -25,25 +25,13 @@
 
 namespace Diligent
 {
-    struct ContextInitInfo
-    {
-        SwapChainDesc SwapChainAttribs;
-        void *pNativeWndHandle = nullptr;
-    };
-
     class GLContext
     {
     public:
         typedef void* NativeGLContextType; // NSOpenGLContext*
 
-        GLContext(const ContextInitInfo &Info, struct DeviceCaps &DeviceCaps);
-        void SwapBuffers();
-
-        const SwapChainDesc& GetSwapChainDesc()const{ return m_SwapChainAttribs; }
+        GLContext(const struct EngineGLAttribs &InitAttribs, struct DeviceCaps &DeviceCaps);
 
         NativeGLContextType GetCurrentNativeGLContext();
-
-    private:
-        SwapChainDesc m_SwapChainAttribs;
     };
 }

Graphics/GraphicsEngineOpenGL/include/GLContextWindows.h

@@ -25,29 +25,19 @@
 
 namespace Diligent
 {
-
-    struct ContextInitInfo
-    {
-        SwapChainDesc SwapChainAttribs;
-        void *pNativeWndHandle = nullptr;
-    };
-
     class GLContext
     {
     public:
         typedef HGLRC NativeGLContextType;
 
-        GLContext( const ContextInitInfo &Info, struct DeviceCaps &DeviceCaps );
+        GLContext( const struct EngineGLAttribs &InitAttribs, struct DeviceCaps &DeviceCaps );
         ~GLContext();
         void SwapBuffers();
 
-        const SwapChainDesc& GetSwapChainDesc()const{ return m_SwapChainAttribs; }
-
         NativeGLContextType GetCurrentNativeGLContext();
 
     private:
         HGLRC m_Context;
         HDC m_WindowHandleToDeviceContext;
-        SwapChainDesc m_SwapChainAttribs;
     };
 }

Graphics/GraphicsEngineOpenGL/include/GLObjectWrapper.h

@@ -224,9 +224,30 @@ typedef GLObjWrapper<GLSamplerCreateReleaseHelper> GLSamplerObj;
 class GLFBOCreateReleaseHelper
 {
 public:
-    void Create(GLuint &FBO) { glGenFramebuffers(1, &FBO); }
-    void Release(GLuint FBO) { glDeleteFramebuffers(1, &FBO); }
+    explicit GLFBOCreateReleaseHelper(GLuint ExternalFBOHandle = 0) :
+        m_ExternalFBOHandle(ExternalFBOHandle)
+    {}
+
+    void Create(GLuint &FBO) 
+    { 
+        if (m_ExternalFBOHandle != 0)
+            FBO = m_ExternalFBOHandle; // Attach to external FBO handle
+        else
+            glGenFramebuffers(1, &FBO); 
+    }
+
+    void Release(GLuint FBO) 
+    { 
+        if (m_ExternalFBOHandle != 0)
+            m_ExternalFBOHandle = 0; // DO NOT delete the FBO
+        else
+            glDeleteFramebuffers(1, &FBO); 
+    }
+
     static const char *Name;
+
+private:
+    GLuint m_ExternalFBOHandle;
 };
 typedef GLObjWrapper<GLFBOCreateReleaseHelper> GLFrameBufferObj;
 

Graphics/GraphicsEngineOpenGL/include/RenderDeviceGLESImpl.h

@@ -31,7 +31,7 @@ namespace Diligent
 class RenderDeviceGLESImpl : public RenderDeviceGLImpl
 {
 public:
-    RenderDeviceGLESImpl( IReferenceCounters *pRefCounters, IMemoryAllocator &RawMemAllocator, const ContextInitInfo &InitInfo );
+    RenderDeviceGLESImpl( IReferenceCounters *pRefCounters, IMemoryAllocator &RawMemAllocator, const EngineGLAttribs &InitAttribs );
 
     virtual void QueryInterface( const Diligent::INTERFACE_ID &IID, IObject **ppInterface );
 

Graphics/GraphicsEngineOpenGL/include/RenderDeviceGLImpl.h

@@ -29,6 +29,7 @@
 #include "BaseInterfacesGL.h"
 #include "FBOCache.h"
 #include "TexRegionRender.h"
+#include "EngineGLAttribs.h"
 
 enum class GPU_VENDOR
 {
@@ -55,7 +56,7 @@ class RenderDeviceGLImpl : public RenderDeviceBase<IGLDeviceBaseInterface>
 public:
     typedef RenderDeviceBase<IGLDeviceBaseInterface> TRenderDeviceBase;
 
-    RenderDeviceGLImpl( IReferenceCounters *pRefCounters, IMemoryAllocator &RawMemAllocator, const ContextInitInfo &InitInfo );
+    RenderDeviceGLImpl( IReferenceCounters *pRefCounters, IMemoryAllocator &RawMemAllocator, const EngineGLAttribs &InitAttribs );
     ~RenderDeviceGLImpl();
     virtual void QueryInterface( const Diligent::INTERFACE_ID &IID, IObject **ppInterface )override;
 

Graphics/GraphicsEngineOpenGL/include/SwapChainGLImpl.h

@@ -25,6 +25,7 @@
 
 #include "SwapChainGL.h"
 #include "SwapChainBase.h"
+#include "GLObjectWrapper.h"
 
 namespace Diligent
 {
@@ -37,16 +38,19 @@ class SwapChainGLImpl : public SwapChainBase<ISwapChainGL>
     typedef SwapChainBase<ISwapChainGL> TSwapChainBase;
 
     SwapChainGLImpl(IReferenceCounters *pRefCounters,
+                    const EngineGLAttribs &InitAttribs,
                     const SwapChainDesc& SwapChainDesc, 
                     class RenderDeviceGLImpl* pRenderDeviceGL,
                     class DeviceContextGLImpl* pImmediateContextGL);
     ~SwapChainGLImpl();
 
-    virtual void QueryInterface( const Diligent::INTERFACE_ID &IID, IObject **ppInterface );
+    virtual void QueryInterface( const Diligent::INTERFACE_ID &IID, IObject **ppInterface )override;
 
-    virtual void Present();
+    virtual void Present()override;
 
-    virtual void Resize( Uint32 NewWidth, Uint32 NewHeight );
+    virtual void Resize( Uint32 NewWidth, Uint32 NewHeight )override;
+
+    virtual GLuint GetDefaultFBO()const override { return 0; }
 };
 
 }