make Erfan happy for n4ce

Author: devshgraphicsprogramming

include/nbl/video/surface/CSurfaceVulkan.h

@@ -34,10 +34,10 @@ class NBL_API2 ISurfaceVulkan : public ISurface
 };
 
 #ifdef _NBL_PLATFORM_WINDOWS_
-class NBL_API2 CSurfaceVulkanWin32 final : public CSurface<ui::IWindowWin32, ISurfaceVulkan>
+class NBL_API2 CSurfaceVulkanWin32 final : public CSurface<ui::IWindowWin32,ISurfaceVulkan>
 {
         using this_t = CSurfaceVulkanWin32;
-        using base_t = CSurface<ui::IWindowWin32, ISurfaceVulkan>;
+        using base_t = CSurface<ui::IWindowWin32,ISurfaceVulkan>;
     public:
         inline CSurfaceVulkanWin32(core::smart_refctd_ptr<ui::IWindowWin32>&& window, core::smart_refctd_ptr<IAPIConnection>&& api, VkSurfaceKHR surf) :
             base_t(std::move(window), std::move(api), surf) {}

include/nbl/video/surface/ISurface.h

@@ -22,10 +22,6 @@ class ISurface : public core::IReferenceCounted
         ISurface(core::smart_refctd_ptr<IAPIConnection>&& api) : m_api(std::move(api)) {}
         virtual ~ISurface() = default;
 
-        //impl of getSurfaceCapabilitiesForPhysicalDevice() needs this
-        virtual uint32_t getWidth() const = 0;
-        virtual uint32_t getHeight() const = 0;
-
         core::smart_refctd_ptr<IAPIConnection> m_api;
 
     public:
@@ -194,22 +190,25 @@ class ISurface : public core::IReferenceCounted
 
         virtual bool getSurfaceCapabilitiesForPhysicalDevice(const IPhysicalDevice* physicalDevice, ISurface::SCapabilities& capabilities) const = 0;
 
-        virtual ui::IWindow* getWindow() = 0;
-        inline const ui::IWindow* getWindow() const {return const_cast<ui::IWindow*>(const_cast<ISurface*>(this)->getWindow());}
-
         // used by some drivers
         virtual const void* getNativeWindowHandle() const = 0;
 };
 
-// Base for use with Nabla's window wrappers
-template<class Window, class ImmediateBase>
+// Base for use with Nabla's window wrappers, should maybe be called `CSurfaceWindow` instead, but oh well
+template<class Window, class ImmediateBase> requires (std::is_base_of_v<ui::IWindow,Window> && std::is_base_of_v<ISurface,ImmediateBase>)
 class CSurface : public ImmediateBase
 {
+        using this_t = CSurface<Window, ImmediateBase>;
+
     public:
-        inline ui::IWindow* getWindow() override final
+        using window_t = Window;
+        using immediate_base_t = ImmediateBase;
+
+        inline window_t* getWindow()
         {
             return m_window.get();
         }
+        inline const window_t* getWindow() const {return const_cast<window_t*>(const_cast<this_t*>(this)->getWindow());}
 
         inline const void* getNativeWindowHandle() const override final
         {
@@ -218,17 +217,14 @@ class CSurface : public ImmediateBase
 
     protected:
         template<typename... Args>
-        CSurface(core::smart_refctd_ptr<Window>&& window, Args&&... args) : ImmediateBase(std::forward<Args>(args)...), m_window(std::move(window)) {}
+        CSurface(core::smart_refctd_ptr<window_t>&& window, Args&&... args) : immediate_base_t(std::forward<Args>(args)...), m_window(std::move(window)) {}
         virtual ~CSurface() = default;
 
-        uint32_t getWidth() const override { return m_window->getWidth(); }
-        uint32_t getHeight() const override { return m_window->getHeight(); }
-
-        core::smart_refctd_ptr<Window> m_window;
+        core::smart_refctd_ptr<window_t> m_window;
 };
 
-// Base to make surfaces directly from Native OS window handles
-template<class Window, class ImmediateBase>
+// Base to make surfaces directly from Native OS window handles (TODO: while merging Erfan, template on the handle instead of the Window)
+template<class Window, class ImmediateBase> requires std::is_base_of_v<ISurface,ImmediateBase>
 class CSurfaceNative : public ImmediateBase
 {
     public:

include/nbl/video/utilities/CResizableSurface.h

@@ -423,9 +423,11 @@ template<typename SwapchainResources> requires std::is_base_of_v<IResizableSurfa
 class CResizableSurface final : public IResizableSurface
 {
 	public:
-		using this_t = CResizableSurface<SwapchainResources>;		
+		using this_t = CResizableSurface<SwapchainResources>;
+
 		// Factory method so we can fail, requires a `_surface` created from a window and with a callback that inherits from `ICallback` declared just above
-		static inline core::smart_refctd_ptr<this_t> create(core::smart_refctd_ptr<ISurface>&& _surface)
+		template<typename Surface> requires std::is_base_of_v<CSurface<typename Surface::window_t,typename Surface::immediate_base_t>,Surface>
+		static inline core::smart_refctd_ptr<this_t> create(core::smart_refctd_ptr<Surface>&& _surface)
 		{
 			if (!_surface)
 				return nullptr;