fix(linux): wayland surface failing to initialize

Author: Silverlan

include/misc/window_generic.h

@@ -48,7 +48,7 @@ namespace Anvil
 		};
 		using Connection = void*;
 		using Display = void*;
-        static Anvil::WindowUniquePtr create(Type type, Handle handle, Display display, Connection connection, uint32_t width, uint32_t height, bool visible);
+        static Anvil::WindowUniquePtr create(Type type, Handle handle, Display display, Connection connection, uint32_t width, uint32_t height, bool visible, uint32_t fbWidth, uint32_t fbHeight);
 
         virtual ~WindowGeneric() { /* Stub */ }
 
@@ -70,6 +70,9 @@ namespace Anvil
         virtual void* get_connection() const { return m_connection; }
 		Type get_type() const { return m_type; }
 		Display get_display() const { return m_display; }
+        Handle get_generic_handle() const { return m_handle; }
+        uint32_t get_framebuffer_width() const { return m_fbWidth; }
+        uint32_t get_framebuffer_height() const { return m_fbHeight; }
 
         /** Changes the window title.
          *
@@ -87,6 +90,8 @@ namespace Anvil
 		              Connection                    connection,
                       unsigned int                   in_width,
                       unsigned int                   in_height,
+                      uint32_t                      fbWidth,
+                      uint32_t                      fbHeight,
                       PresentCallbackFunction        in_present_callback_func);
 
         /** Creates a new system window and prepares it for usage. */
@@ -96,6 +101,9 @@ namespace Anvil
 		Type m_type;
 		Display m_display;
 		Connection m_connection;
+        Handle m_handle;
+        uint32_t m_fbWidth;
+        uint32_t m_fbHeight;
     };
 }; /* namespace Anvil */
 

src/misc/window_generic.cpp

@@ -31,22 +31,26 @@ Anvil::WindowGeneric::WindowGeneric(Type type,
 	                                Connection connection,
                                     unsigned int                   in_width,
                                     unsigned int                   in_height,
+                                    uint32_t                   fbWidth,
+                                    uint32_t                   fbHeight,
                                     Anvil::PresentCallbackFunction in_present_callback_func)
     :Window(in_title,
             in_width,
             in_height,
             true, /* in_closable */
             in_present_callback_func)
 {
-	m_window = *reinterpret_cast<WindowHandle*>(&handle);
     m_window_owned = false;
 	m_type = type;
     m_display = display;
 	m_connection = connection;
+    m_handle = handle;
+    m_fbWidth = fbWidth;
+    m_fbHeight = fbHeight;
 }
 
 /** Please see header for specification */
-Anvil::WindowUniquePtr Anvil::WindowGeneric::create(Type type, Handle handle, Display display, Connection connection, uint32_t width, uint32_t height, bool visible)
+Anvil::WindowUniquePtr Anvil::WindowGeneric::create(Type type, Handle handle, Display display, Connection connection, uint32_t width, uint32_t height, bool visible, uint32_t fbWidth, uint32_t fbHeight)
 {
     WindowUniquePtr result_ptr (nullptr,
                                 std::default_delete<Window>() );
@@ -64,6 +68,8 @@ Anvil::WindowUniquePtr Anvil::WindowGeneric::create(Type type, Handle handle, Di
                                  connection,
                                  window_size[0],
                                  window_size[1],
+                                 fbWidth,
+                                 fbHeight,
                                  nullptr) /* present_callback_func_ptr */
     );
 

src/wrappers/rendering_surface.cpp

@@ -413,7 +413,7 @@ bool Anvil::RenderingSurface::init()
 				VkXcbSurfaceCreateInfoKHR surface_create_info;
 
 				surface_create_info.flags = 0;
-				surface_create_info.window = window_ptr->get_handle();
+				surface_create_info.window = generic_ptr->get_generic_handle().xcbWindow;
 				surface_create_info.connection = static_cast<xcb_connection_t *>(window_ptr->get_connection());
 				surface_create_info.pNext = nullptr;
 				surface_create_info.sType = VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR;
@@ -422,13 +422,15 @@ bool Anvil::RenderingSurface::init()
 				  &m_surface);
 			}
 			else if(type == Anvil::WindowGeneric::Type::Wayland) {
+                auto vkInstance = instance_ptr->get_instance_vk();
+                auto &entrypoints = instance_ptr->get_extension_khr_wayland_surface_entrypoints();
 				VkWaylandSurfaceCreateInfoKHR surface_create_info;
 				surface_create_info.flags = 0;
 				surface_create_info.display = reinterpret_cast<wl_display *>(window_ptr->get_connection());
-				surface_create_info.surface = reinterpret_cast<wl_surface *>(window_ptr->get_handle());
+				surface_create_info.surface = reinterpret_cast<wl_surface *>(generic_ptr->get_generic_handle().waylandWindow);
 				surface_create_info.pNext = nullptr;
 				surface_create_info.sType = VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR;
-				result = instance_ptr->get_extension_khr_wayland_surface_entrypoints().vkCreateWaylandSurfaceKHR(instance_ptr->get_instance_vk(), &surface_create_info, nullptr, /* pAllocator */
+				result = entrypoints.vkCreateWaylandSurfaceKHR(vkInstance, &surface_create_info, nullptr, /* pAllocator */
 				  &m_surface);
 			}
 			else
@@ -736,6 +738,28 @@ void Anvil::RenderingSurface::update_surface_extents() const
         {
             m_height = surface_caps.current_extent.height;
             m_width  = surface_caps.current_extent.width;
+
+            if(m_width == m_height && m_width == std::numeric_limits<uint32_t>::max())
+            {
+                // The surface is not limited to a specific size, so we'll just use the window framebuffer size
+                auto *generic_ptr = dynamic_cast<const Anvil::WindowGeneric *>(window_ptr);
+                if(generic_ptr != nullptr)
+                {
+                    m_height = generic_ptr->get_framebuffer_height();
+                    m_width  = generic_ptr->get_framebuffer_width();
+                    
+                    // Clamp to max extents
+                    if(m_height > surface_caps.max_image_extent.height)
+                        m_height = surface_caps.max_image_extent.height;
+                    if(m_width > surface_caps.max_image_extent.width)
+                        m_width = surface_caps.max_image_extent.width;
+                }
+                else
+                {
+                    m_height = surface_caps.min_image_extent.height;
+                    m_width  = surface_caps.min_image_extent.width;
+                }
+            }
         }
         else
         {