Continued work on Vulkan with Wayland.

Author: Dandielo

source/code/modules/vulkan_renderer/private/vk_driver.cxx

@@ -10,6 +10,12 @@
 #include <ice/container/array.hxx>
 #include <ice/assert.hxx>
 
+extern "C"
+{
+    struct wl_display;
+    struct wl_surface;
+}
+
 
 namespace ice::render::vk
 {
@@ -71,6 +77,11 @@ namespace ice::render::vk
                     {
                         _vk_physical_device = physical_device;
                     }
+                    if (physical_device_properties.deviceType == VkPhysicalDeviceType::VK_PHYSICAL_DEVICE_TYPE_CPU
+                        && _vk_physical_device == vk_nullptr)
+                    {
+                        _vk_physical_device = physical_device;
+                    }
                 }
             }
 
@@ -211,6 +222,61 @@ namespace ice::render::vk
 
         return _vk_alloc->create<VulkanRenderSurface>(_vk_instance, vulkan_surface);
     }
+#elif ISP_LINUX
+    auto VulkanRenderDriver::create_surface(
+        ice::render::SurfaceInfo const& surface_info
+    ) noexcept -> ice::render::RenderSurface*
+    {
+        ICE_ASSERT(
+            surface_info.type == ice::render::SurfaceType::Wayland_Window,
+            "Unsupported surface type provided, accepting 'Wayland_Window' surfaces only!"
+        );
+
+        VkWaylandSurfaceCreateInfoKHR surface_create_info{ VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR };
+        surface_create_info.display = static_cast<wl_display*>(surface_info.wayland.display);
+        surface_create_info.surface = static_cast<wl_surface*>(surface_info.wayland.surface);
+
+        VkSurfaceKHR vulkan_surface;
+        auto api_result = vkCreateWaylandSurfaceKHR(_vk_instance, &surface_create_info, nullptr, &vulkan_surface);
+        ICE_ASSERT(api_result == VkResult::VK_SUCCESS, "Failed to create Vulkan surface!");
+
+        ice::i32 family_index = 0;
+        for (VkQueueFamilyProperties const& queue_family_props : _vk_queue_family_properties)
+        {
+            VkBool32 supports_presenting;
+
+            [[maybe_unused]]
+            VkResult ph_api_result = vkGetPhysicalDeviceSurfaceSupportKHR(
+                _vk_physical_device,
+                family_index,
+                vulkan_surface,
+                &supports_presenting
+            );
+            ICE_ASSERT(
+                ph_api_result == VkResult::VK_SUCCESS,
+                "Couldn't query information if family {} (index) supports presenting!",
+                family_index
+            );
+
+            if (supports_presenting == VK_TRUE)
+            {
+                if (_vk_presentation_queue_family_index == -1)
+                {
+                    _vk_presentation_queue_family_index = family_index;
+                }
+                else if ((queue_family_props.queueFlags & VK_QUEUE_GRAPHICS_BIT) != 0)
+                {
+                    _vk_presentation_queue_family_index = family_index;
+                }
+            }
+
+            family_index += 1;
+        }
+
+        return _vk_alloc->create<VulkanRenderSurface>(_vk_instance, vulkan_surface);
+    }
+#else
+#error Missing implementation
 #endif
 
     void VulkanRenderDriver::destroy_surface(

source/code/modules/vulkan_renderer/private/vk_extensions.cxx

@@ -14,6 +14,8 @@ namespace ice::render::vk
         { ExtensionTarget::InstanceExtension, Extension::VkI_Win32Surface, 0, VK_KHR_WIN32_SURFACE_EXTENSION_NAME },
 #elif ISP_ANDROID
         { ExtensionTarget::InstanceExtension, Extension::VkI_AndroidSurface, 0, VK_KHR_ANDROID_SURFACE_EXTENSION_NAME },
+#elif ISP_LINUX
+        { ExtensionTarget::InstanceExtension, Extension::VkI_WaylandSurface, 0, VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME },
 #else
 #error Unknown platform
 #endif

source/code/modules/vulkan_renderer/private/vk_extensions.hxx

@@ -14,8 +14,9 @@ namespace ice::render::vk
 
         // Core instance extensions
         VkI_Surface = 0x0000'0001,
-        VkI_Win32Surface= 0x0000'0002,
-        VkI_AndroidSurface= 0x0000'0004,
+        VkI_Win32Surface = 0x0000'0002, // The three surfaces are mutually exclusive so they may share the same value
+        VkI_AndroidSurface = 0x0000'0002,
+        VkI_WaylandSurface = 0x0000'0002,
         VkI_GetPhysicalDeviceProperties2 = 0x0000'0008,
 
         // Core device extensions

source/code/platforms/platform_linux/private/linux_sdl2_platform_render_surface.cxx

@@ -14,6 +14,7 @@ namespace ice::platform::linux::sdl2
 
     RenderSurface_WaylandSDL2::RenderSurface_WaylandSDL2() noexcept
     {
+        SDL_VideoInit("wayland");
         SDL_InitSubSystem(SDL_INIT_VIDEO);
     }
 
@@ -26,6 +27,7 @@ namespace ice::platform::linux::sdl2
         }
 
         SDL_QuitSubSystem(SDL_INIT_VIDEO);
+        SDL_VideoQuit();
     }
 
     auto RenderSurface_WaylandSDL2::create(ice::platform::RenderSurfaceParams surface_params) noexcept -> ice::Result
@@ -78,9 +80,10 @@ namespace ice::platform::linux::sdl2
         }
 
         SDL_SysWMinfo wm_info{};
+        SDL_VERSION(&wm_info.version);
         SDL_GetWindowWMInfo(_window, &wm_info);
 
-        out_surface_info.type = ice::render::SurfaceType::Win32_Window;
+        out_surface_info.type = ice::render::SurfaceType::Wayland_Window;
         out_surface_info.wayland.surface = wm_info.info.wl.surface;
         out_surface_info.wayland.display = wm_info.info.wl.display;
         return true;

source/code/systems/render_system/public/ice/render/render_surface.hxx

@@ -17,6 +17,7 @@ namespace ice::render
     {
         Win32_Window,
         UWP_Window,
+        Wayland_Window,
         Android_NativeWindow,
         HTML5_DOMCanvas
     };

source/conanfile.txt

@@ -18,8 +18,9 @@ rapidxml_ns/1.13.2@iceshard/stable
 rapidjson/1.1.0
 rapidfuzz_cpp/3.0.5@iceshard/stable
 
-[requires-Windows-MSVC]
 vulkan-memory-allocator/3.0.1
+
+[requires-Windows-MSVC]
 catch2/3.3.2@iceshard/stable
 
 assimp/5.2.5@iceshard/stable
@@ -33,7 +34,6 @@ msdf_atlas_gen/1.2.2@iceshard/stable
 imguizmo/1.91.3@iceshard/stable
 
 [requires-Linux-Clang]
-vulkan-memory-allocator/3.0.1
 catch2/3.3.2@iceshard/stable
 
 assimp/5.2.5@iceshard/stable
@@ -46,11 +46,6 @@ msdf_atlas_gen/1.2.2@iceshard/stable
 # Editor only packages
 imguizmo/1.91.3@iceshard/stable
 
-[requires-Android-Arm64]
-vulkan-memory-allocator/3.0.1
-
-[requires-Android-x64]
-vulkan-memory-allocator/3.0.1
 
 [options-Android-Arm64]
 tracy/*:shared=False

tools/settings.json

@@ -40,5 +40,8 @@
     },
     "doxy": {
         "config": "source/configs/doxyfile"
+    },
+    "vulkan": {
+        "version": "1.4.313.0"
     }
 }