Merge pull request #47 from apriori/master

Recursive update of all dependencies
calebwin · Mar 26, 2021 · 9fe3db3 · 9fe3db3
2 parents f7c38f7 + 80a28e7
commit 9fe3db3
Show file tree

Hide file tree

Showing 5 changed files with 129 additions and 114 deletions.
diff --git a/emu_core/Cargo.toml b/emu_core/Cargo.toml
@@ -23,14 +23,15 @@ default = []
 glsl-compile = ["shaderc"]
 
 [dependencies]
-wgpu = "0.5.0"
-futures = "0.3.1"
-zerocopy = "0.2.0"
+wgpu = "0.7.0"
+futures = "0.3.12"
+zerocopy = "0.3.0"
 lazy_static = "1.4.0"
-derive_more = "0.99.2"
-shaderc = { version = "0.6.2", optional = true }
+derive_more = "0.99.11"
+shaderc = { version = "0.7.1", optional = true }
+gfx-auxil = "0.8.0"
 
 [dev-dependencies]
-futures = "0.3"
+futures = "0.3.12"
 timeit = "0.1.2"
 emu_glsl = "0.1.0"
diff --git a/emu_core/src/compile.rs b/emu_core/src/compile.rs
@@ -12,8 +12,6 @@ use std::hash::{Hash, Hasher};
 use std::io::{Read, Seek};
 use std::sync::Arc;
 
-use wgpu::read_spirv;
-
 // TODO in the future, generalize this to other types, not just struct
 /// A trait for structures that can exist in both Rust and GLSL
 pub trait GlslStruct {
@@ -134,7 +132,7 @@ impl<P: BorrowMut<[u32]>> SpirvBuilder<P> {
 impl SpirvBuilder<Vec<u32>> {
     /// Set the actual code itself using an owned `Vec<u32>``
     pub fn set_code_with_u8(mut self, code: impl Read + Seek) -> Result<Self, std::io::Error> {
-        self.code = Some(read_spirv(code)?);
+        self.code = Some(gfx_auxil::read_spirv(code)?);
         Ok(self)
     }
 }