Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ash-window: Update raw-window-metal to v1.0 #939

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

ash-window: Update raw-window-metal to v1.0 #939

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eefa0d2
Update raw-window-metal to v1.0
madsmtm Sep 4, 2024
1701e1a
Add visionOS to README support docs
madsmtm Sep 11, 2024
93b8512
Fix missing as_ptr call
madsmtm Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ash-examples/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ impl ExampleBase {
.to_vec();
extension_names.push(debug_utils::NAME.as_ptr());

#[cfg(any(target_os = "macos", target_os = "ios"))]
#[cfg(target_vendor = "apple")]
{
extension_names.push(ash::khr::portability_enumeration::NAME.as_ptr());
// Enabling this extension is a requirement when using `VK_KHR_portability_subset`
Expand All @@ -242,7 +242,7 @@ impl ExampleBase {
.engine_version(0)
.api_version(vk::make_api_version(0, 1, 0, 0));

let create_flags = if cfg!(any(target_os = "macos", target_os = "ios")) {
let create_flags = if cfg!(target_vendor = "apple") {
vk::InstanceCreateFlags::ENUMERATE_PORTABILITY_KHR
} else {
vk::InstanceCreateFlags::default()
Expand Down Expand Up @@ -315,7 +315,7 @@ impl ExampleBase {
let queue_family_index = queue_family_index as u32;
let device_extension_names_raw = [
swapchain::NAME.as_ptr(),
#[cfg(any(target_os = "macos", target_os = "ios"))]
#[cfg(target_vendor = "apple")]
ash::khr::portability_subset::NAME.as_ptr(),
];
let features = vk::PhysicalDeviceFeatures {
Expand Down
4 changes: 2 additions & 2 deletions ash-window/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ rust-version = "1.69.0"
ash = { path = "../ash", version = "0.38", default-features = false, features = ["std"] }
raw-window-handle = "0.6"

[target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies]
raw-window-metal = "0.4"
[target.'cfg(target_vendor = "apple")'.dependencies]
raw-window-metal = "1.0"

[dev-dependencies]
winit = { version = "0.29", features = ["rwh_06"] }
Expand Down
2 changes: 1 addition & 1 deletion ash-window/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ ash = "0.37"

- [x] Windows (`VK_KHR_win32_surface`)
- [x] Unix (`VK_KHR_xlib_surface`/`VK_KHR_xcb_surface`/`VK_KHR_wayland_surface`)
- [x] MacOS/IOS (`VK_EXT_metal_surface`)
- [x] macOS/iOS/tvOS (`VK_EXT_metal_surface`)
madsmtm marked this conversation as resolved.
Show resolved Hide resolved
- [x] Android (`VK_KHR_android_surface`)

## License
Expand Down
24 changes: 8 additions & 16 deletions ash-window/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,28 +95,20 @@ pub unsafe fn create_surface(
surface_fn.create_android_surface(&surface_desc, allocation_callbacks)
}

#[cfg(target_os = "macos")]
(RawDisplayHandle::AppKit(_), RawWindowHandle::AppKit(window)) => {
use raw_window_metal::{appkit, Layer};
#[cfg(target_vendor = "apple")]
(RawDisplayHandle::AppKit(_), RawWindowHandle::AppKit(handle)) => {
let layer = raw_window_metal::Layer::from_ns_view(handle.ns_view);

let layer = match appkit::metal_layer_from_handle(window) {
Layer::Existing(layer) | Layer::Allocated(layer) => layer.cast(),
};

let surface_desc = vk::MetalSurfaceCreateInfoEXT::default().layer(&*layer);
let surface_desc = vk::MetalSurfaceCreateInfoEXT::default().layer(layer.as_ptr());
let surface_fn = metal_surface::Instance::new(entry, instance);
surface_fn.create_metal_surface(&surface_desc, allocation_callbacks)
}

#[cfg(target_os = "ios")]
(RawDisplayHandle::UiKit(_), RawWindowHandle::UiKit(window)) => {
use raw_window_metal::{uikit, Layer};

let layer = match uikit::metal_layer_from_handle(window) {
Layer::Existing(layer) | Layer::Allocated(layer) => layer.cast(),
};
#[cfg(target_vendor = "apple")]
(RawDisplayHandle::UiKit(_), RawWindowHandle::UiKit(handle)) => {
let layer = raw_window_metal::Layer::from_ui_view(handle.ui_view);

let surface_desc = vk::MetalSurfaceCreateInfoEXT::default().layer(&*layer);
let surface_desc = vk::MetalSurfaceCreateInfoEXT::default().layer(layer.as_ptr());
let surface_fn = metal_surface::Instance::new(entry, instance);
surface_fn.create_metal_surface(&surface_desc, allocation_callbacks)
}
Expand Down
9 changes: 2 additions & 7 deletions ash/src/entry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,14 @@ impl Entry {

#[cfg(all(
unix,
not(any(
target_os = "macos",
target_os = "ios",
target_os = "android",
target_os = "fuchsia"
))
not(any(target_vendor = "apple", target_os = "android", target_os = "fuchsia"))
))]
const LIB_PATH: &str = "libvulkan.so.1";

#[cfg(any(target_os = "android", target_os = "fuchsia"))]
const LIB_PATH: &str = "libvulkan.so";

#[cfg(any(target_os = "macos", target_os = "ios"))]
#[cfg(target_vendor = "apple")]
const LIB_PATH: &str = "libvulkan.dylib";

Self::load_from(LIB_PATH)
Expand Down
Loading