From 06f4c122c6a050e8f28e2919f812559d223e2fdd Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Mon, 15 Jun 2020 18:11:41 -0400 Subject: [PATCH] [rs] Revert "API update for RODS2" This reverts commit edb36105306f166d41789c383df5ee66d74f1287. --- wgpu/Cargo.toml | 6 +++--- wgpu/examples/cube/main.rs | 5 +---- wgpu/examples/mipmap/main.rs | 10 ++-------- wgpu/examples/shadow/main.rs | 5 +---- wgpu/examples/skybox/main.rs | 5 +---- wgpu/src/backend/direct.rs | 26 +++++++++++--------------- wgpu/src/backend/web.rs | 13 ++++++------- wgpu/src/lib.rs | 5 +---- 8 files changed, 26 insertions(+), 49 deletions(-) diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index f5b1fd8364..d193524de0 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -28,20 +28,20 @@ vulkan = ["wgc/gfx-backend-vulkan"] package = "wgpu-core" version = "0.5" git = "https://github.com/gfx-rs/wgpu" -rev = "2dd3439475de6ea59488a91ea7d66096d3aecbbf" +rev = "d1deae5747f5bd0a6503c1462555f201eaae02c9" features = ["raw-window-handle"] [dependencies.wgt] package = "wgpu-types" version = "0.5" git = "https://github.com/gfx-rs/wgpu" -rev = "2dd3439475de6ea59488a91ea7d66096d3aecbbf" +rev = "d1deae5747f5bd0a6503c1462555f201eaae02c9" [dependencies] arrayvec = "0.5" futures = "0.3" smallvec = "1" -typed-arena = "2" +typed-arena = "2.0.1" raw-window-handle = "0.3" parking_lot = "0.10" diff --git a/wgpu/examples/cube/main.rs b/wgpu/examples/cube/main.rs index aa7af10a53..b66bb0f0a5 100644 --- a/wgpu/examples/cube/main.rs +++ b/wgpu/examples/cube/main.rs @@ -224,10 +224,7 @@ impl framework::Example for Example { }, wgpu::Binding { binding: 1, - resource: wgpu::BindingResource::TextureView { - view: &texture_view, - read_only_depth_stencil: false, - }, + resource: wgpu::BindingResource::TextureView(&texture_view), }, wgpu::Binding { binding: 2, diff --git a/wgpu/examples/mipmap/main.rs b/wgpu/examples/mipmap/main.rs index ab6eadc8f6..071be587f3 100644 --- a/wgpu/examples/mipmap/main.rs +++ b/wgpu/examples/mipmap/main.rs @@ -180,10 +180,7 @@ impl Example { bindings: &[ wgpu::Binding { binding: 0, - resource: wgpu::BindingResource::TextureView { - view: &views[target_mip - 1], - read_only_depth_stencil: false, - }, + resource: wgpu::BindingResource::TextureView(&views[target_mip - 1]), }, wgpu::Binding { binding: 1, @@ -331,10 +328,7 @@ impl framework::Example for Example { }, wgpu::Binding { binding: 1, - resource: wgpu::BindingResource::TextureView { - view: &texture_view, - read_only_depth_stencil: false, - }, + resource: wgpu::BindingResource::TextureView(&texture_view), }, wgpu::Binding { binding: 2, diff --git a/wgpu/examples/shadow/main.rs b/wgpu/examples/shadow/main.rs index 18aaee1d2f..f4ae65f20c 100644 --- a/wgpu/examples/shadow/main.rs +++ b/wgpu/examples/shadow/main.rs @@ -575,10 +575,7 @@ impl framework::Example for Example { }, wgpu::Binding { binding: 2, - resource: wgpu::BindingResource::TextureView { - view: &shadow_view, - read_only_depth_stencil: false, - }, + resource: wgpu::BindingResource::TextureView(&shadow_view), }, wgpu::Binding { binding: 3, diff --git a/wgpu/examples/skybox/main.rs b/wgpu/examples/skybox/main.rs index 791c483dbe..acbf7250bd 100644 --- a/wgpu/examples/skybox/main.rs +++ b/wgpu/examples/skybox/main.rs @@ -222,10 +222,7 @@ impl framework::Example for Skybox { }, wgpu::Binding { binding: 1, - resource: wgpu::BindingResource::TextureView { - view: &texture_view, - read_only_depth_stencil: false, - }, + resource: wgpu::BindingResource::TextureView(&texture_view), }, wgpu::Binding { binding: 2, diff --git a/wgpu/src/backend/direct.rs b/wgpu/src/backend/direct.rs index 80badfab28..5cfbf20a86 100644 --- a/wgpu/src/backend/direct.rs +++ b/wgpu/src/backend/direct.rs @@ -413,7 +413,7 @@ impl crate::Context for Context { ) -> Self::BindGroupId { use wgc::binding_model as bm; - let texture_view_arena: Arena = Arena::new(); + let texture_view_arena: Arena = Arena::new(); let bindings = desc .bindings .iter() @@ -427,21 +427,17 @@ impl crate::Context for Context { size: buffer_slice.size, }) } - BindingResource::Sampler(sampler) => bm::BindingResource::Sampler(sampler.id), - BindingResource::TextureView { - view, - read_only_depth_stencil, - } => bm::BindingResource::TextureView(bm::TextureBinding { - view_id: view.id, - read_only_depth_stencil, - }), + BindingResource::Sampler(ref sampler) => { + bm::BindingResource::Sampler(sampler.id) + } + BindingResource::TextureView(ref texture_view) => { + bm::BindingResource::TextureView(texture_view.id) + } BindingResource::TextureViewArray(texture_view_array) => { - bm::BindingResource::TextureViewArray(texture_view_arena.alloc_extend( - texture_view_array.iter().map(|view| bm::TextureBinding { - view_id: view.id, - read_only_depth_stencil: false, //TODO - }), - )) + bm::BindingResource::TextureViewArray( + texture_view_arena + .alloc_extend(texture_view_array.iter().map(|view| view.id)), + ) } }, }) diff --git a/wgpu/src/backend/web.rs b/wgpu/src/backend/web.rs index 86a38756d4..7e0f161e09 100644 --- a/wgpu/src/backend/web.rs +++ b/wgpu/src/backend/web.rs @@ -869,13 +869,12 @@ impl crate::Context for Context { JsValue::from(mapped_buffer_binding.clone()) } BindingResource::Sampler(ref sampler) => JsValue::from(sampler.id.0.clone()), - BindingResource::TextureView { - view: ref texture_view, - read_only_depth_stencil: _, - } => JsValue::from(texture_view.id.0.clone()), - BindingResource::TextureViewArray(..) => panic!( - "Web backend does not support SAMPLED_TEXTURE_BINDING_ARRAY extension" - ), + BindingResource::TextureView(ref texture_view) => { + JsValue::from(texture_view.id.0.clone()) + } + BindingResource::TextureViewArray(..) => { + panic!("Web backend does not support BINDING_INDEXING extension") + } }; web_sys::GpuBindGroupEntry::new(binding.binding, &mapped_resource) diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs index 2163323c2e..b9cdf38ea9 100644 --- a/wgpu/src/lib.rs +++ b/wgpu/src/lib.rs @@ -700,10 +700,7 @@ pub struct Queue { pub enum BindingResource<'a> { Buffer(BufferSlice<'a>), Sampler(&'a Sampler), - TextureView { - view: &'a TextureView, - read_only_depth_stencil: bool, - }, + TextureView(&'a TextureView), TextureViewArray(&'a [TextureView]), }