Merge branch 'master' of https://github.com/vulkano-rs/vulkano into s…

…parse
vulkano-rs · Dec 14, 2024 · ab464bc · ab464bc
2 parents c134079 + fc94e4e
commit ab464bc
Show file tree

Hide file tree

Showing 63 changed files with 16,631 additions and 24,750 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -113,6 +113,7 @@ Changes to vulkano-util:
 Extensions:
 - `khr_draw_indirect_count`
 - `khr_fragment_shading_rate` (partially)
+- `khr_ray_tracing_pipeline`
 - `khr_timeline_semaphore`
 - `ext_conservative_rasterization`
 - `ext_host_query_reset`
@@ -177,7 +178,9 @@ Other:
 - Fixed UB in `GenericMemoryAllocator::deallocate` arising due to invalid pointer provenance given out on allocation.
 - Fixed UB in `impl VertexBufferCollection for Vec<Subbuffer<T>>` where a `Vec` was being transmuted.
 - Fixed `AllocationHandle::as_index` being a const fn, as it is UB to observe the address of a pointer in const eval.
+- [#2607](https://github.com/vulkano-rs/vulkano/issues/2607): Incorrect buffer used in acceleration structure build validation
 - Vulkano-shaders: Fixed shader struct names that are invalid rust idents from panicking the shader! macro. Rust-gpu emitted struct names such as `foo::bar::MyStruct` now work.
+- Vulkano-shaders: Fixed `shader!` invocations using the `bytes` option not getting recompiled automatically when the source file changes.
 
 # Version 0.34.1 (2023-10-29)
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -43,14 +43,14 @@ version = "0.34"
 path = "vulkano-util"
 
 [workspace.dependencies]
-ahash = "0.8"
 # When updating Ash, also update vk.xml to the same Vulkan patch version that Ash uses.
 # All versions of vk.xml can be found at:
 # https://github.com/KhronosGroup/Vulkan-Headers/commits/main/registry/vk.xml
 ash = "0.38.0"
 bytemuck = "1.9"
 concurrent-slotmap = "0.1.0-alpha.1"
 crossbeam-queue = "0.3"
+foldhash = "0.1"
 half = "2.0"
 heck = "0.4"
 indexmap = "2.0"

diff --git a/examples/ray-tracing-auto/Cargo.toml b/examples/ray-tracing-auto/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "ray-tracing-auto"
+version = "0.0.0"
+edition = "2021"
+publish = false
+
+[[bin]]
+name = "ray-tracing-auto"
+path = "main.rs"
+test = false
+bench = false
+doc = false
+
+[dependencies]
+vulkano = { workspace = true, default-features = true }
+vulkano-shaders = { workspace = true }
+winit = { workspace = true, default-features = true }
+ash = { workspace = true }
+glam = { workspace = true }