ash-window: Support OpenHarmony handles through VK_OHOS_surface

Author: MarijnS95

ash-window/Cargo.toml

@@ -20,7 +20,7 @@ rust-version = "1.69.0"
 
 [dependencies]
 ash = { path = "../ash", version = "0.38", default-features = false, features = ["std"] }
-raw-window-handle = "0.6"
+raw-window-handle = "0.6.2"
 
 [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies]
 raw-window-metal = "0.4"

ash-window/Changelog.md

@@ -1,5 +1,7 @@
 # Changelog
 
+- Added support for `VK_OHOS_surface` (#xxx)
+
 ## [0.13.0] - 2024-03-31
 
 - Bumped MSRV from 1.59 to 1.69 for `winit 0.28` and `raw-window-handle 0.5.1`, and `CStr::from_bytes_until_nul`. (#709, #716, #746)

ash-window/src/lib.rs

@@ -5,6 +5,7 @@ use std::os::raw::c_char;
 use ash::{
     ext::metal_surface,
     khr::{android_surface, surface, wayland_surface, win32_surface, xcb_surface, xlib_surface},
+    ohos::surface as ohos_surface,
     vk, Entry, Instance, VkResult,
 };
 use raw_window_handle::{RawDisplayHandle, RawWindowHandle};
@@ -94,6 +95,13 @@ pub unsafe fn create_surface(
             surface_fn.create_android_surface(&surface_desc, allocation_callbacks)
         }
 
+        (RawDisplayHandle::Ohos(_), RawWindowHandle::OhosNdk(window)) => {
+            let surface_desc =
+                vk::SurfaceCreateInfoOHOS::default().window(window.native_window.as_ptr());
+            let surface_fn = ohos_surface::Instance::new(entry, instance);
+            surface_fn.create_surface(&surface_desc, allocation_callbacks)
+        }
+
         #[cfg(target_os = "macos")]
         (RawDisplayHandle::AppKit(_), RawWindowHandle::AppKit(window)) => {
             use raw_window_metal::{appkit, Layer};
@@ -165,6 +173,12 @@ pub fn enumerate_required_extensions(
             &ANDROID_EXTS
         }
 
+        RawDisplayHandle::Ohos(_) => {
+            const OHOS_EXTS: [*const c_char; 2] =
+                [surface::NAME.as_ptr(), ohos_surface::NAME.as_ptr()];
+            &OHOS_EXTS
+        }
+
         RawDisplayHandle::AppKit(_) | RawDisplayHandle::UiKit(_) => {
             const METAL_EXTS: [*const c_char; 2] =
                 [surface::NAME.as_ptr(), metal_surface::NAME.as_ptr()];