Update to rust_gpu 0.6.0

Cargo.toml

@@ -5,7 +5,3 @@ members = [
     "kea_renderer",
     "kea_renderer_shaders",
 ]
-
-# https://github.com/EmbarkStudios/rust-gpu/issues/938
-[patch.crates-io]
-libm = { git = "https://github.com/rust-lang/libm", tag = "0.2.5" }

kea_gpu/Cargo.toml

@@ -8,13 +8,13 @@ license = "MIT"
 ash = { version = "0.37.0", features = ["linked"] }
 ash-window = "0.12.0"
 raw-window-handle="0.5.0"
-winit = "0.27.4"
+winit = "0.28.1"
 log = "0.4.17"
-gpu-allocator = "0.21.0"
-glam = "0.22.0"
-memoffset = "0.7.1"
+gpu-allocator = "0.22.0"
+memoffset = "0.8.0"
 num-traits = "0.2.15"
 downcast-rs = "1.2.0"
-spirv-builder = "0.4.0-alpha.17"
+spirv-builder = "0.6.0"
+spirv-std = "0.6.0"
 
 kea_gpu_shaderlib = { path = "../kea_gpu_shaderlib" }

kea_gpu/src/ray_tracing/scenes/geometry.rs

@@ -1,9 +1,9 @@
 use super::{acceleration_structure::AccelerationStructure, scratch_buffer::ScratchBuffer};
 use crate::{commands::CommandBuffer, device::Device, storage::buffers::Buffer};
 use ash::vk;
-use glam::Vec3A;
 use gpu_allocator::MemoryLocation;
 use kea_gpu_shaderlib::Aabb;
+use spirv_std::glam::Vec3A;
 use std::{mem, slice, sync::Arc};
 
 pub enum GeometryType {

kea_gpu/src/ray_tracing/scenes/geometry_instance.rs

@@ -1,6 +1,6 @@
 use super::Geometry;
 use ash::vk;
-use glam::Affine3A;
+use spirv_std::glam::Affine3A;
 use std::sync::Arc;
 
 pub struct GeometryInstance {

kea_gpu/src/storage/memory.rs

@@ -1,5 +1,8 @@
 use ash::vk;
-use gpu_allocator::{vulkan::AllocationCreateDesc, MemoryLocation};
+use gpu_allocator::{
+    vulkan::{AllocationCreateDesc, AllocationScheme},
+    MemoryLocation,
+};
 use num_traits::{PrimInt, Unsigned};
 use std::{mem::ManuallyDrop, os::raw::c_void, sync::Arc};
 
@@ -31,6 +34,7 @@ impl Allocation {
                 requirements,
                 location,
                 linear: true,
+                allocation_scheme: AllocationScheme::GpuAllocatorManaged,
             })
             .unwrap();
 

kea_gpu_shaderlib/Cargo.toml

@@ -8,4 +8,4 @@ license = "MIT"
 crate-type = ["dylib", "lib"]
 
 [dependencies]
-spirv-std = { version = "0.4.0-alpha.17", features = ["glam"] }
+spirv-std = { version = "0.6.0" }

kea_renderer/Cargo.toml

@@ -7,13 +7,13 @@ license = "MIT"
 [dependencies]
 ash = { version = "0.37.0", features = ["linked"] }
 ash-window = "0.12.0"
-winit = "0.27.4"
+winit = "0.28.1"
 log = "0.4.17"
-env_logger = "0.9.0"
-gpu-allocator = "0.21.0"
-glam = "0.22.0"
-memoffset = "0.7.1"
-bevy_ecs = "0.9.0"
+env_logger = "0.10.0"
+gpu-allocator = "0.22.0"
+memoffset = "0.8.0"
+bevy_ecs = "0.10.0"
+spirv-std = "0.6.0"
 
 kea_gpu = { path = "../kea_gpu" }
 kea_gpu_shaderlib = { path = "../kea_gpu_shaderlib" }

kea_renderer/src/scenes/examples.rs

@@ -1,7 +1,7 @@
 use super::Scene;
-use glam::{vec3, vec3a, Quat, Vec3A};
 use kea_gpu::device::Device;
 use kea_renderer_shaders::materials::Material;
+use spirv_std::glam::{vec3, vec3a, Quat, Vec3A};
 use std::sync::Arc;
 
 // pub fn basic_shapes(device: Arc<Device>) -> Scene {

kea_renderer/src/scenes/scene.rs

@@ -1,6 +1,5 @@
 use ash::vk;
 use bevy_ecs::prelude::*;
-use glam::{vec3a, Affine3A, Quat, Vec3, Vec3A};
 use gpu_allocator::MemoryLocation;
 use kea_gpu::{
     device::Device,
@@ -10,6 +9,7 @@ use kea_gpu::{
 };
 use kea_gpu_shaderlib::Aabb;
 use kea_renderer_shaders::SlotId;
+use spirv_std::glam::{vec3a, Affine3A, Quat, Vec3, Vec3A};
 use std::sync::Arc;
 
 pub struct Scene {

kea_renderer_shaders/Cargo.toml

@@ -9,4 +9,4 @@ crate-type = ["dylib", "lib"]
 
 [dependencies]
 kea_gpu_shaderlib = { path = "../kea_gpu_shaderlib" }
-spirv-std = { version = "0.4.0-alpha.17", features = ["glam"] }
+spirv-std = { version = "0.6.0" }

rust-toolchain

@@ -1,14 +0,0 @@
-# If you see this, run `rustup self update` to get rustup 1.23 or newer.
-
-# NOTE: above comment is for older `rustup` (before TOML support was added),
-# which will treat the first line as the toolchain name, and therefore show it
-# to the user in the error, instead of "error: invalid channel name '[toolchain]'".
-
-[toolchain]
-channel = "nightly-2022-10-01"
-components = ["rust-src", "rustc-dev", "llvm-tools-preview"]
-# commit_hash = 8ce3204af9463db3192ea1eb31c45c2f6d4b5ae6
-
-# Whenever changing the nightly channel, update the commit hash above, and make
-# sure to change REQUIRED_TOOLCHAIN in crates/rustc_codegen_spirv/src/build.rs also.
-

rust-toolchain.toml

@@ -0,0 +1,8 @@
+# This file should match https://raw.githubusercontent.com/EmbarkStudios/rust-gpu/main/rust-toolchain.toml
+[toolchain]
+channel = "nightly-2023-01-21"
+components = ["rust-src", "rustc-dev", "llvm-tools-preview"]
+# commit_hash = 5ce39f42bd2c8bca9c570f0560ebe1fce4eddb14
+
+# Whenever changing the nightly channel, update the commit hash above, and make
+# sure to change REQUIRED_TOOLCHAIN in crates/rustc_codegen_spirv/src/build.rs also.