nordic-dev.net/vulkano
nordic-dev.net/vulkano
2
0
Fork 0
mirror of https://github.com/vulkano-rs/vulkano.git synced 2024-11-25 00:04:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix vulkano-util depending on vulkano-win (#2382)

Browse Source
This commit is contained in:
marc0246 2023-10-30 00:28:56 +01:00 committed by GitHub
parent 80ca8a051b
commit c560d765f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vulkano-util/Cargo.toml
View File

@ -15,5 +15,4 @@ readme = "../README.md"
[dependencies] [dependencies]
ahash = "0.8" ahash = "0.8"
vulkano = { version = "0.34.0", path = "../vulkano", default-features = false } vulkano = { version = "0.34.0", path = "../vulkano", default-features = false }
vulkano-win = { version = "0.34.0", path = "../vulkano-win" }
winit = { version = "0.28" } winit = { version = "0.28" }

18
vulkano-util/src/context.rs
View File

@ -125,8 +125,6 @@ impl VulkanoContext {
/// # Panics /// # Panics
/// ///
/// - Panics where the underlying Vulkano struct creations fail /// - Panics where the underlying Vulkano struct creations fail
// FIXME:
#[allow(deprecated)]
pub fn new(mut config: VulkanoConfig) -> Self { pub fn new(mut config: VulkanoConfig) -> Self {
let library = match VulkanLibrary::new() { let library = match VulkanLibrary::new() {
Ok(x) => x, Ok(x) => x,
@ -139,7 +137,21 @@ impl VulkanoContext {
}; };
// Append required extensions // Append required extensions
config.instance_create_info.enabled_extensions = vulkano_win::required_extensions(&library) // HACK: This should be replaced with `Surface::required_extensions`, but will need to
// happen in the next minor version bump. It should have been done before releasing 0.34.
config.instance_create_info.enabled_extensions = library
.supported_extensions()
.intersection(&InstanceExtensions {
khr_surface: true,
khr_xlib_surface: true,
khr_xcb_surface: true,
khr_wayland_surface: true,
khr_android_surface: true,
khr_win32_surface: true,
mvk_ios_surface: true,
mvk_macos_surface: true,
..InstanceExtensions::empty()
})
.union(&config.instance_create_info.enabled_extensions); .union(&config.instance_create_info.enabled_extensions);
// Create instance // Create instance