From dccc57e7b5a0b5d9524238565d12c4df4a71f470 Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Sat, 5 Dec 2020 11:28:16 -0500 Subject: [PATCH 1/3] Switch playtests to WGSL --- Cargo.lock | 20 ++++++++++---------- player/Cargo.toml | 5 +++++ player/src/lib.rs | 3 ++- player/tests/data/bind-group.ron | 2 +- player/tests/data/empty.comp | 5 ----- player/tests/data/empty.comp.spv | Bin 280 -> 0 bytes player/tests/data/empty.wgsl | 3 +++ player/tests/data/quad.frag | 7 ------- player/tests/data/quad.frag.spv | Bin 408 -> 0 bytes player/tests/data/quad.ron | 12 ++++-------- player/tests/data/quad.vert | 10 ---------- player/tests/data/quad.vert.spv | Bin 964 -> 0 bytes player/tests/data/quad.wgsl | 24 ++++++++++++++++++++++++ player/tests/test.rs | 4 +++- wgpu-core/Cargo.toml | 20 ++++++++++---------- wgpu-core/src/validation.rs | 7 ++++--- 16 files changed, 66 insertions(+), 56 deletions(-) delete mode 100644 player/tests/data/empty.comp delete mode 100644 player/tests/data/empty.comp.spv create mode 100644 player/tests/data/empty.wgsl delete mode 100644 player/tests/data/quad.frag delete mode 100644 player/tests/data/quad.frag.spv delete mode 100644 player/tests/data/quad.vert delete mode 100644 player/tests/data/quad.vert.spv create mode 100644 player/tests/data/quad.wgsl diff --git a/Cargo.lock b/Cargo.lock index d9a0892223..f48d6e685d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -441,7 +441,7 @@ dependencies = [ [[package]] name = "gfx-auxil" version = "0.5.0" -source = "git+https://github.com/gfx-rs/gfx?rev=654ad48ee39ce2a341407ae2857ddf4db639ea54#654ad48ee39ce2a341407ae2857ddf4db639ea54" +source = "git+https://github.com/gfx-rs/gfx?rev=4b4a79eea213b4b22fe150b1995ef6a0c381249f#4b4a79eea213b4b22fe150b1995ef6a0c381249f" dependencies = [ "fxhash", "gfx-hal", @@ -451,7 +451,7 @@ dependencies = [ [[package]] name = "gfx-backend-dx11" version = "0.6.0" -source = "git+https://github.com/gfx-rs/gfx?rev=654ad48ee39ce2a341407ae2857ddf4db639ea54#654ad48ee39ce2a341407ae2857ddf4db639ea54" +source = "git+https://github.com/gfx-rs/gfx?rev=4b4a79eea213b4b22fe150b1995ef6a0c381249f#4b4a79eea213b4b22fe150b1995ef6a0c381249f" dependencies = [ "arrayvec", "bitflags", @@ -472,7 +472,7 @@ dependencies = [ [[package]] name = "gfx-backend-dx12" version = "0.6.2" -source = "git+https://github.com/gfx-rs/gfx?rev=654ad48ee39ce2a341407ae2857ddf4db639ea54#654ad48ee39ce2a341407ae2857ddf4db639ea54" +source = "git+https://github.com/gfx-rs/gfx?rev=4b4a79eea213b4b22fe150b1995ef6a0c381249f#4b4a79eea213b4b22fe150b1995ef6a0c381249f" dependencies = [ "arrayvec", "bit-set", @@ -492,7 +492,7 @@ dependencies = [ [[package]] name = "gfx-backend-empty" version = "0.6.0" -source = "git+https://github.com/gfx-rs/gfx?rev=654ad48ee39ce2a341407ae2857ddf4db639ea54#654ad48ee39ce2a341407ae2857ddf4db639ea54" +source = "git+https://github.com/gfx-rs/gfx?rev=4b4a79eea213b4b22fe150b1995ef6a0c381249f#4b4a79eea213b4b22fe150b1995ef6a0c381249f" dependencies = [ "gfx-hal", "log", @@ -502,7 +502,7 @@ dependencies = [ [[package]] name = "gfx-backend-gl" version = "0.6.0" -source = "git+https://github.com/gfx-rs/gfx?rev=654ad48ee39ce2a341407ae2857ddf4db639ea54#654ad48ee39ce2a341407ae2857ddf4db639ea54" +source = "git+https://github.com/gfx-rs/gfx?rev=4b4a79eea213b4b22fe150b1995ef6a0c381249f#4b4a79eea213b4b22fe150b1995ef6a0c381249f" dependencies = [ "arrayvec", "bitflags", @@ -524,7 +524,7 @@ dependencies = [ [[package]] name = "gfx-backend-metal" version = "0.6.0" -source = "git+https://github.com/gfx-rs/gfx?rev=654ad48ee39ce2a341407ae2857ddf4db639ea54#654ad48ee39ce2a341407ae2857ddf4db639ea54" +source = "git+https://github.com/gfx-rs/gfx?rev=4b4a79eea213b4b22fe150b1995ef6a0c381249f#4b4a79eea213b4b22fe150b1995ef6a0c381249f" dependencies = [ "arrayvec", "bitflags", @@ -549,7 +549,7 @@ dependencies = [ [[package]] name = "gfx-backend-vulkan" version = "0.6.5" -source = "git+https://github.com/gfx-rs/gfx?rev=654ad48ee39ce2a341407ae2857ddf4db639ea54#654ad48ee39ce2a341407ae2857ddf4db639ea54" +source = "git+https://github.com/gfx-rs/gfx?rev=4b4a79eea213b4b22fe150b1995ef6a0c381249f#4b4a79eea213b4b22fe150b1995ef6a0c381249f" dependencies = [ "arrayvec", "ash", @@ -568,7 +568,7 @@ dependencies = [ [[package]] name = "gfx-hal" version = "0.6.0" -source = "git+https://github.com/gfx-rs/gfx?rev=654ad48ee39ce2a341407ae2857ddf4db639ea54#654ad48ee39ce2a341407ae2857ddf4db639ea54" +source = "git+https://github.com/gfx-rs/gfx?rev=4b4a79eea213b4b22fe150b1995ef6a0c381249f#4b4a79eea213b4b22fe150b1995ef6a0c381249f" dependencies = [ "bitflags", "naga", @@ -927,7 +927,7 @@ dependencies = [ [[package]] name = "naga" version = "0.2.0" -source = "git+https://github.com/gfx-rs/naga?tag=gfx-2#0d81b1f78c763a2f564194ec108bcb8ead10ea2e" +source = "git+https://github.com/gfx-rs/naga?tag=gfx-3#b597bc5af6f2affabb5a47dfcd5f8f2e32f766fe" dependencies = [ "bitflags", "fxhash", @@ -1217,7 +1217,7 @@ dependencies = [ [[package]] name = "range-alloc" version = "0.1.1" -source = "git+https://github.com/gfx-rs/gfx?rev=654ad48ee39ce2a341407ae2857ddf4db639ea54#654ad48ee39ce2a341407ae2857ddf4db639ea54" +source = "git+https://github.com/gfx-rs/gfx?rev=4b4a79eea213b4b22fe150b1995ef6a0c381249f#4b4a79eea213b4b22fe150b1995ef6a0c381249f" [[package]] name = "raw-window-handle" diff --git a/player/Cargo.toml b/player/Cargo.toml index 7e4a766be7..fa1f060753 100644 --- a/player/Cargo.toml +++ b/player/Cargo.toml @@ -34,6 +34,11 @@ package = "wgpu-core" version = "0.6" features = ["replay", "raw-window-handle"] +#[target.'cfg(any(target_os = "ios", target_os = "macos"))'.dependencies.gfx-backend-metal] +#git = "https://github.com/gfx-rs/gfx" +#rev = "4b4a79eea213b4b22fe150b1995ef6a0c381249f" +#features = ["auto-capture"] + [dependencies.wgpu-subscriber] git = "https://github.com/gfx-rs/subscriber.git" rev = "cdc9feb53f152f9c41905ed9efeff2c1ed214361" diff --git a/player/src/lib.rs b/player/src/lib.rs index 33dfc494f0..9319a8e8fe 100644 --- a/player/src/lib.rs +++ b/player/src/lib.rs @@ -218,7 +218,8 @@ impl GlobalPlay for wgc::hub::Global { let code = fs::read_to_string(dir.join(data)).unwrap(); wgc::pipeline::ShaderModuleSource::Wgsl(Cow::Owned(code)) } else { - let byte_vec = fs::read(dir.join(data)).unwrap(); + let byte_vec = fs::read(dir.join(&data)) + .unwrap_or_else(|e| panic!("Unable to open '{}': {:?}", data, e)); let spv = byte_vec .chunks(4) .map(|c| u32::from_le_bytes([c[0], c[1], c[2], c[3]])) diff --git a/player/tests/data/bind-group.ron b/player/tests/data/bind-group.ron index 8a4ecb3c5f..81e6eadee4 100644 --- a/player/tests/data/bind-group.ron +++ b/player/tests/data/bind-group.ron @@ -10,7 +10,7 @@ CreateShaderModule( id: Id(0, 1, Empty), label: None, - data: "empty.comp.spv", + data: "empty.wgsl", ), CreateComputePipeline(Id(0, 1, Empty), ( label: None, diff --git a/player/tests/data/empty.comp b/player/tests/data/empty.comp deleted file mode 100644 index e1ed54725b..0000000000 --- a/player/tests/data/empty.comp +++ /dev/null @@ -1,5 +0,0 @@ -#version 450 -layout(local_size_x = 1) in; - -void main() { -} diff --git a/player/tests/data/empty.comp.spv b/player/tests/data/empty.comp.spv deleted file mode 100644 index 484a9bca4f28d5df4f00162cc9e2696ca82a8daf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 280 zcmYk1%?`mp6orqDR%wDpMC^zqX)F+L&`o!J0*Q?U8=lZp*+_h+G;t>~3~8x-rl*IbJO(|w=kyPSQ& K_#bbQNALlc5)76A diff --git a/player/tests/data/empty.wgsl b/player/tests/data/empty.wgsl new file mode 100644 index 0000000000..2d6cffb18e --- /dev/null +++ b/player/tests/data/empty.wgsl @@ -0,0 +1,3 @@ +[[stage(compute), workgroup_size(1)]] +fn main() { +} diff --git a/player/tests/data/quad.frag b/player/tests/data/quad.frag deleted file mode 100644 index d3b9253bda..0000000000 --- a/player/tests/data/quad.frag +++ /dev/null @@ -1,7 +0,0 @@ -#version 450 - -layout(location = 0) out vec4 outColor; - -void main() { - outColor = vec4(1.0, 1.0, 1.0, 1.0); -} \ No newline at end of file diff --git a/player/tests/data/quad.frag.spv b/player/tests/data/quad.frag.spv deleted file mode 100644 index 2abc8a88e858412a32fe2629a1abb190482caeb7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 408 zcmYk2&1%9x6orq**i@^n6zWbaUABmeDg{9oBC`p&@BxOBWHFE?qOsu4XX{gSQ|LL< zE;4X(=bn7`CkdKQS3m<1dbq*g8K6lA=%VeTiFfhjSf!KK*;GUyfd|Fhl4&tYAMdWv zi)-qRj662yEnr9Biv=xoU}9^wTN7_=vftZdbO64#~V)ivjSnytP%s{f`FGA@~^r|N$A$KR-5JWwdy diff --git a/player/tests/data/quad.ron b/player/tests/data/quad.ron index 10d6f1d17d..84f435a098 100644 --- a/player/tests/data/quad.ron +++ b/player/tests/data/quad.ron @@ -11,11 +11,7 @@ actions: [ CreateShaderModule( id: Id(0, 1, Empty), - data: "quad.vert.spv", - ), - CreateShaderModule( - id: Id(1, 1, Empty), - data: "quad.frag.spv", + data: "quad.wgsl", ), CreateTexture(Id(0, 1, Empty), ( label: Some("Output Texture"), @@ -58,11 +54,11 @@ layout: Some(Id(0, 1, Empty)), vertex_stage: ( module: Id(0, 1, Empty), - entry_point: "main", + entry_point: "vs_main", ), fragment_stage: Some(( - module: Id(1, 1, Empty), - entry_point: "main", + module: Id(0, 1, Empty), + entry_point: "fs_main", )), rasterization_state: None, primitive_topology: TriangleList, diff --git a/player/tests/data/quad.vert b/player/tests/data/quad.vert deleted file mode 100644 index e8dbb80ba6..0000000000 --- a/player/tests/data/quad.vert +++ /dev/null @@ -1,10 +0,0 @@ -#version 450 - -out gl_PerVertex { - vec4 gl_Position; -}; - -void main() { - vec2 pos = vec2(gl_VertexIndex == 2 ? 3.0 : -1.0, gl_VertexIndex == 1 ? 3.0 : -1.0); - gl_Position = vec4(pos, 0.0, 1.0); -} \ No newline at end of file diff --git a/player/tests/data/quad.vert.spv b/player/tests/data/quad.vert.spv deleted file mode 100644 index 5ed23e2e16242f4cf051cb10d42991f714264412..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 964 zcmYk3$w~uJ5Jk(x#5m9M6vu@^aG@fI(?VJyU_@}+NYY3{?1ZEh-Q{=mCj`IBjo>{! zXkMt)t6R5*cRQQe=rilFf(_fY#b?|yLd*s&A9<&IS1z@~T511a55|aPBO;tpQ@KvB z?CHS|xDUyeWLf<(@?RqM+JHG_*SWcI%9n1n*>v0CTitW(e&D$^zvWd!|HXq>=;HZ7 zwf#VGEa(Qi|C`qBSTnzB1{IpE(ya`MbV zAHFgAoG3 in_vertex_index: u32; +[[builtin(position)]] +var out_pos: vec4; + +[[stage(vertex)]] +fn vs_main() { + # hacky way to draw a large triangle + var tmp1: i32 = i32(in_vertex_index) / 2; + var tmp2: i32 = i32(in_vertex_index) & 1; + var pos: vec2 = vec2( + f32(tmp1) * 4.0 - 1.0, + f32(tmp2) * 4.0 - 1.0 + ); + out_pos = vec4(pos, 0.0, 1.0); +} + +[[location(0)]] +var out_color: vec4; + +[[stage(fragment)]] +fn fs_main() { + out_color = vec4(1.0, 1.0, 1.0, 1.0); +} diff --git a/player/tests/test.rs b/player/tests/test.rs index a79ed3a5cf..1253a83f34 100644 --- a/player/tests/test.rs +++ b/player/tests/test.rs @@ -144,7 +144,9 @@ impl Test<'_> { } }; - assert_eq!(&expected_data[..], contents); + if &expected_data[..] != contents { + panic!("Test expectation is not met!"); + } } wgc::gfx_select!(device => global.clear_backend(())); diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml index cee96fdde7..faa7ff01c3 100644 --- a/wgpu-core/Cargo.toml +++ b/wgpu-core/Cargo.toml @@ -35,25 +35,25 @@ thiserror = "1" gpu-alloc = { git = "https://github.com/zakarumych/gpu-alloc", rev = "d07be73f9439a37c89f5b72f2500cbf0eb4ff613" } gpu-descriptor = { git = "https://github.com/zakarumych/gpu-descriptor", rev = "df74fd8c7bea03149058a41aab0e4fe04077b266"} -hal = { package = "gfx-hal", git = "https://github.com/gfx-rs/gfx", rev = "654ad48ee39ce2a341407ae2857ddf4db639ea54" } -gfx-backend-empty = { git = "https://github.com/gfx-rs/gfx", rev = "654ad48ee39ce2a341407ae2857ddf4db639ea54" } +hal = { package = "gfx-hal", git = "https://github.com/gfx-rs/gfx", rev = "4b4a79eea213b4b22fe150b1995ef6a0c381249f" } +gfx-backend-empty = { git = "https://github.com/gfx-rs/gfx", rev = "4b4a79eea213b4b22fe150b1995ef6a0c381249f" } [target.'cfg(all(unix, not(target_os = "ios"), not(target_os = "macos")))'.dependencies] -gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "654ad48ee39ce2a341407ae2857ddf4db639ea54" } -gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "654ad48ee39ce2a341407ae2857ddf4db639ea54" } +gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "4b4a79eea213b4b22fe150b1995ef6a0c381249f" } +gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "4b4a79eea213b4b22fe150b1995ef6a0c381249f" } [target.'cfg(any(target_os = "ios", target_os = "macos"))'.dependencies] -gfx-backend-metal = { git = "https://github.com/gfx-rs/gfx", rev = "654ad48ee39ce2a341407ae2857ddf4db639ea54", features = ["naga"] } -gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "654ad48ee39ce2a341407ae2857ddf4db639ea54", optional = true } +gfx-backend-metal = { git = "https://github.com/gfx-rs/gfx", rev = "4b4a79eea213b4b22fe150b1995ef6a0c381249f", features = ["naga"] } +gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "4b4a79eea213b4b22fe150b1995ef6a0c381249f", optional = true } [target.'cfg(windows)'.dependencies] -gfx-backend-dx12 = { git = "https://github.com/gfx-rs/gfx", rev = "654ad48ee39ce2a341407ae2857ddf4db639ea54" } -gfx-backend-dx11 = { git = "https://github.com/gfx-rs/gfx", rev = "654ad48ee39ce2a341407ae2857ddf4db639ea54" } -gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "654ad48ee39ce2a341407ae2857ddf4db639ea54" } +gfx-backend-dx12 = { git = "https://github.com/gfx-rs/gfx", rev = "4b4a79eea213b4b22fe150b1995ef6a0c381249f" } +gfx-backend-dx11 = { git = "https://github.com/gfx-rs/gfx", rev = "4b4a79eea213b4b22fe150b1995ef6a0c381249f" } +gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "4b4a79eea213b4b22fe150b1995ef6a0c381249f" } [dependencies.naga] git = "https://github.com/gfx-rs/naga" -tag = "gfx-2" +tag = "gfx-3" features = ["spv-in", "spv-out", "wgsl-in"] [dependencies.wgt] diff --git a/wgpu-core/src/validation.rs b/wgpu-core/src/validation.rs index afe34873d5..009abad4a5 100644 --- a/wgpu-core/src/validation.rs +++ b/wgpu-core/src/validation.rs @@ -154,7 +154,7 @@ pub enum StageError { #[error("shader module is invalid")] InvalidModule, #[error("unable to find an entry point at {0:?} stage")] - MissingEntryPoint(wgt::ShaderStage), + MissingEntryPoint(String), #[error("error matching global binding at index {binding} in group {group} against the pipeline layout: {error}")] Binding { group: u32, @@ -792,10 +792,11 @@ impl Interface { wgt::ShaderStage::COMPUTE => naga::ShaderStage::Compute, _ => unreachable!(), }; + let pair = (shader_stage, entry_point_name.to_string()); let entry_point = self .entry_points - .get(&(shader_stage, entry_point_name.to_string())) - .ok_or(StageError::MissingEntryPoint(stage_bit))?; + .get(&pair) + .ok_or(StageError::MissingEntryPoint(pair.1))?; for &(handle, usage) in entry_point.resources.iter() { let res = &self.resources[handle]; From 3f33434c6f494d310879505f901f920b98faf4d2 Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Sun, 6 Dec 2020 15:14:14 -0500 Subject: [PATCH 2/3] Enable experimental translation to playtests --- player/src/lib.rs | 6 +----- player/tests/data/bind-group.ron | 5 ++++- player/tests/data/quad.ron | 4 ++++ wgpu-core/src/device/mod.rs | 3 +-- wgpu-core/src/device/trace.rs | 2 +- wgpu-core/src/pipeline.rs | 5 ++++- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/player/src/lib.rs b/player/src/lib.rs index 9319a8e8fe..4533929505 100644 --- a/player/src/lib.rs +++ b/player/src/lib.rs @@ -209,11 +209,7 @@ impl GlobalPlay for wgc::hub::Global { A::DestroyBindGroup(id) => { self.bind_group_drop::(id); } - A::CreateShaderModule { id, label, data } => { - let desc = wgc::pipeline::ShaderModuleDescriptor { - label, - experimental_translation: false, - }; + A::CreateShaderModule { id, desc, data } => { let source = if data.ends_with(".wgsl") { let code = fs::read_to_string(dir.join(data)).unwrap(); wgc::pipeline::ShaderModuleSource::Wgsl(Cow::Owned(code)) diff --git a/player/tests/data/bind-group.ron b/player/tests/data/bind-group.ron index 81e6eadee4..db6c3670db 100644 --- a/player/tests/data/bind-group.ron +++ b/player/tests/data/bind-group.ron @@ -9,7 +9,10 @@ )), CreateShaderModule( id: Id(0, 1, Empty), - label: None, + desc: ( + label: None, + experimental_translation: true, + ), data: "empty.wgsl", ), CreateComputePipeline(Id(0, 1, Empty), ( diff --git a/player/tests/data/quad.ron b/player/tests/data/quad.ron index 84f435a098..79f681901a 100644 --- a/player/tests/data/quad.ron +++ b/player/tests/data/quad.ron @@ -11,6 +11,10 @@ actions: [ CreateShaderModule( id: Id(0, 1, Empty), + desc: ( + label: None, + experimental_translation: true, + ), data: "quad.wgsl", ), CreateTexture(Id(0, 1, Empty), ( diff --git a/wgpu-core/src/device/mod.rs b/wgpu-core/src/device/mod.rs index c60e8d1b25..849c142ea7 100644 --- a/wgpu-core/src/device/mod.rs +++ b/wgpu-core/src/device/mod.rs @@ -3314,11 +3314,10 @@ impl Global { #[cfg(feature = "trace")] if let Some(ref trace) = device.trace { let mut trace = trace.lock(); - let label = desc.label.clone(); trace.add(trace::Action::CreateShaderModule { id: id.0, + desc: desc.clone(), data, - label, }); } diff --git a/wgpu-core/src/device/trace.rs b/wgpu-core/src/device/trace.rs index 8fbd08526d..2b2924ed30 100644 --- a/wgpu-core/src/device/trace.rs +++ b/wgpu-core/src/device/trace.rs @@ -71,7 +71,7 @@ pub enum Action<'a> { DestroyBindGroup(id::BindGroupId), CreateShaderModule { id: id::ShaderModuleId, - label: crate::Label<'a>, + desc: crate::pipeline::ShaderModuleDescriptor<'a>, data: FileName, }, DestroyShaderModule(id::ShaderModuleId), diff --git a/wgpu-core/src/pipeline.rs b/wgpu-core/src/pipeline.rs index 9c90df0c4d..59cc28d281 100644 --- a/wgpu-core/src/pipeline.rs +++ b/wgpu-core/src/pipeline.rs @@ -20,12 +20,15 @@ pub enum ShaderModuleSource<'a> { Naga(naga::Module), } -#[derive(Debug)] +#[derive(Clone, Debug)] +#[cfg_attr(feature = "trace", derive(serde::Serialize))] +#[cfg_attr(feature = "replay", derive(serde::Deserialize))] pub struct ShaderModuleDescriptor<'a> { pub label: Label<'a>, /// If enabled, `wgpu` will attempt to operate on `Naga` representation /// of the shader module for both validation and translation into the /// backend shader languages, where `gfx-hal` supports this. + #[cfg_attr(any(feature = "replay", feature = "trace"), serde(default))] pub experimental_translation: bool, } From a316fff4277b7daf187e3d08ed08515aec71a391 Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Mon, 7 Dec 2020 01:30:52 -0500 Subject: [PATCH 3/3] Update Naga to gfx-4, update gfx with GL fixes --- Cargo.lock | 24 ++++++++++++------------ player/Cargo.toml | 2 +- wgpu-core/Cargo.toml | 20 ++++++++++---------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f48d6e685d..c87c75e3b6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -441,7 +441,7 @@ dependencies = [ [[package]] name = "gfx-auxil" version = "0.5.0" -source = "git+https://github.com/gfx-rs/gfx?rev=4b4a79eea213b4b22fe150b1995ef6a0c381249f#4b4a79eea213b4b22fe150b1995ef6a0c381249f" +source = "git+https://github.com/gfx-rs/gfx?rev=f1398d29c7ad726968723a37187bd3932c539783#f1398d29c7ad726968723a37187bd3932c539783" dependencies = [ "fxhash", "gfx-hal", @@ -451,7 +451,7 @@ dependencies = [ [[package]] name = "gfx-backend-dx11" version = "0.6.0" -source = "git+https://github.com/gfx-rs/gfx?rev=4b4a79eea213b4b22fe150b1995ef6a0c381249f#4b4a79eea213b4b22fe150b1995ef6a0c381249f" +source = "git+https://github.com/gfx-rs/gfx?rev=f1398d29c7ad726968723a37187bd3932c539783#f1398d29c7ad726968723a37187bd3932c539783" dependencies = [ "arrayvec", "bitflags", @@ -472,7 +472,7 @@ dependencies = [ [[package]] name = "gfx-backend-dx12" version = "0.6.2" -source = "git+https://github.com/gfx-rs/gfx?rev=4b4a79eea213b4b22fe150b1995ef6a0c381249f#4b4a79eea213b4b22fe150b1995ef6a0c381249f" +source = "git+https://github.com/gfx-rs/gfx?rev=f1398d29c7ad726968723a37187bd3932c539783#f1398d29c7ad726968723a37187bd3932c539783" dependencies = [ "arrayvec", "bit-set", @@ -492,7 +492,7 @@ dependencies = [ [[package]] name = "gfx-backend-empty" version = "0.6.0" -source = "git+https://github.com/gfx-rs/gfx?rev=4b4a79eea213b4b22fe150b1995ef6a0c381249f#4b4a79eea213b4b22fe150b1995ef6a0c381249f" +source = "git+https://github.com/gfx-rs/gfx?rev=f1398d29c7ad726968723a37187bd3932c539783#f1398d29c7ad726968723a37187bd3932c539783" dependencies = [ "gfx-hal", "log", @@ -502,7 +502,7 @@ dependencies = [ [[package]] name = "gfx-backend-gl" version = "0.6.0" -source = "git+https://github.com/gfx-rs/gfx?rev=4b4a79eea213b4b22fe150b1995ef6a0c381249f#4b4a79eea213b4b22fe150b1995ef6a0c381249f" +source = "git+https://github.com/gfx-rs/gfx?rev=f1398d29c7ad726968723a37187bd3932c539783#f1398d29c7ad726968723a37187bd3932c539783" dependencies = [ "arrayvec", "bitflags", @@ -524,7 +524,7 @@ dependencies = [ [[package]] name = "gfx-backend-metal" version = "0.6.0" -source = "git+https://github.com/gfx-rs/gfx?rev=4b4a79eea213b4b22fe150b1995ef6a0c381249f#4b4a79eea213b4b22fe150b1995ef6a0c381249f" +source = "git+https://github.com/gfx-rs/gfx?rev=f1398d29c7ad726968723a37187bd3932c539783#f1398d29c7ad726968723a37187bd3932c539783" dependencies = [ "arrayvec", "bitflags", @@ -549,7 +549,7 @@ dependencies = [ [[package]] name = "gfx-backend-vulkan" version = "0.6.5" -source = "git+https://github.com/gfx-rs/gfx?rev=4b4a79eea213b4b22fe150b1995ef6a0c381249f#4b4a79eea213b4b22fe150b1995ef6a0c381249f" +source = "git+https://github.com/gfx-rs/gfx?rev=f1398d29c7ad726968723a37187bd3932c539783#f1398d29c7ad726968723a37187bd3932c539783" dependencies = [ "arrayvec", "ash", @@ -568,7 +568,7 @@ dependencies = [ [[package]] name = "gfx-hal" version = "0.6.0" -source = "git+https://github.com/gfx-rs/gfx?rev=4b4a79eea213b4b22fe150b1995ef6a0c381249f#4b4a79eea213b4b22fe150b1995ef6a0c381249f" +source = "git+https://github.com/gfx-rs/gfx?rev=f1398d29c7ad726968723a37187bd3932c539783#f1398d29c7ad726968723a37187bd3932c539783" dependencies = [ "bitflags", "naga", @@ -735,9 +735,9 @@ dependencies = [ [[package]] name = "khronos-egl" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ba35280f59eaad0529951ae6ce84357cc954af38c6c74319884f7bdda4df53d" +checksum = "e99a569e2016510b4d6001b8049a377dabbcc00f88b20337641de351bc22edca" dependencies = [ "khronos", "libc 0.2.80", @@ -927,7 +927,7 @@ dependencies = [ [[package]] name = "naga" version = "0.2.0" -source = "git+https://github.com/gfx-rs/naga?tag=gfx-3#b597bc5af6f2affabb5a47dfcd5f8f2e32f766fe" +source = "git+https://github.com/gfx-rs/naga?tag=gfx-4#4f958bf658de7ee4e285bd40a5975136582e1113" dependencies = [ "bitflags", "fxhash", @@ -1217,7 +1217,7 @@ dependencies = [ [[package]] name = "range-alloc" version = "0.1.1" -source = "git+https://github.com/gfx-rs/gfx?rev=4b4a79eea213b4b22fe150b1995ef6a0c381249f#4b4a79eea213b4b22fe150b1995ef6a0c381249f" +source = "git+https://github.com/gfx-rs/gfx?rev=f1398d29c7ad726968723a37187bd3932c539783#f1398d29c7ad726968723a37187bd3932c539783" [[package]] name = "raw-window-handle" diff --git a/player/Cargo.toml b/player/Cargo.toml index fa1f060753..501ab9655d 100644 --- a/player/Cargo.toml +++ b/player/Cargo.toml @@ -36,7 +36,7 @@ features = ["replay", "raw-window-handle"] #[target.'cfg(any(target_os = "ios", target_os = "macos"))'.dependencies.gfx-backend-metal] #git = "https://github.com/gfx-rs/gfx" -#rev = "4b4a79eea213b4b22fe150b1995ef6a0c381249f" +#rev = "f1398d29c7ad726968723a37187bd3932c539783" #features = ["auto-capture"] [dependencies.wgpu-subscriber] diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml index faa7ff01c3..a802558d06 100644 --- a/wgpu-core/Cargo.toml +++ b/wgpu-core/Cargo.toml @@ -35,25 +35,25 @@ thiserror = "1" gpu-alloc = { git = "https://github.com/zakarumych/gpu-alloc", rev = "d07be73f9439a37c89f5b72f2500cbf0eb4ff613" } gpu-descriptor = { git = "https://github.com/zakarumych/gpu-descriptor", rev = "df74fd8c7bea03149058a41aab0e4fe04077b266"} -hal = { package = "gfx-hal", git = "https://github.com/gfx-rs/gfx", rev = "4b4a79eea213b4b22fe150b1995ef6a0c381249f" } -gfx-backend-empty = { git = "https://github.com/gfx-rs/gfx", rev = "4b4a79eea213b4b22fe150b1995ef6a0c381249f" } +hal = { package = "gfx-hal", git = "https://github.com/gfx-rs/gfx", rev = "f1398d29c7ad726968723a37187bd3932c539783" } +gfx-backend-empty = { git = "https://github.com/gfx-rs/gfx", rev = "f1398d29c7ad726968723a37187bd3932c539783" } [target.'cfg(all(unix, not(target_os = "ios"), not(target_os = "macos")))'.dependencies] -gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "4b4a79eea213b4b22fe150b1995ef6a0c381249f" } -gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "4b4a79eea213b4b22fe150b1995ef6a0c381249f" } +gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "f1398d29c7ad726968723a37187bd3932c539783" } +gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "f1398d29c7ad726968723a37187bd3932c539783" } [target.'cfg(any(target_os = "ios", target_os = "macos"))'.dependencies] -gfx-backend-metal = { git = "https://github.com/gfx-rs/gfx", rev = "4b4a79eea213b4b22fe150b1995ef6a0c381249f", features = ["naga"] } -gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "4b4a79eea213b4b22fe150b1995ef6a0c381249f", optional = true } +gfx-backend-metal = { git = "https://github.com/gfx-rs/gfx", rev = "f1398d29c7ad726968723a37187bd3932c539783", features = ["naga"] } +gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "f1398d29c7ad726968723a37187bd3932c539783", optional = true } [target.'cfg(windows)'.dependencies] -gfx-backend-dx12 = { git = "https://github.com/gfx-rs/gfx", rev = "4b4a79eea213b4b22fe150b1995ef6a0c381249f" } -gfx-backend-dx11 = { git = "https://github.com/gfx-rs/gfx", rev = "4b4a79eea213b4b22fe150b1995ef6a0c381249f" } -gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "4b4a79eea213b4b22fe150b1995ef6a0c381249f" } +gfx-backend-dx12 = { git = "https://github.com/gfx-rs/gfx", rev = "f1398d29c7ad726968723a37187bd3932c539783" } +gfx-backend-dx11 = { git = "https://github.com/gfx-rs/gfx", rev = "f1398d29c7ad726968723a37187bd3932c539783" } +gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "f1398d29c7ad726968723a37187bd3932c539783" } [dependencies.naga] git = "https://github.com/gfx-rs/naga" -tag = "gfx-3" +tag = "gfx-4" features = ["spv-in", "spv-out", "wgsl-in"] [dependencies.wgt]