github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

[rs] Merge #376

Browse Source 
376: Revert "API update for RODS2" r=kvark a=kvark

This reverts commit edb3610530.
It also update `wgpu` dependency to https://github.com/gfx-rs/wgpu/pull/723

Co-authored-by: Dzmitry Malyshau <dmalyshau@mozilla.com>
This commit is contained in:
bors[bot]
2020-06-15 22:17:32 +00:00
committed by GitHub
parent f340882712 06f4c122c6
commit 6fa9f46fbc
8 changed files with 26 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wgpu/Cargo.toml
View File

@@ -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"

5
wgpu/examples/cube/main.rs
View File

@@ -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,

10
wgpu/examples/mipmap/main.rs
View File

@@ -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,

5
wgpu/examples/shadow/main.rs
View File

@@ -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,

5
wgpu/examples/skybox/main.rs
View File

@@ -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,

26
wgpu/src/backend/direct.rs
View File

@@ -413,7 +413,7 @@ impl crate::Context for Context {
) -> Self::BindGroupId {
use wgc::binding_model as bm;
let texture_view_arena: Arena<bm::TextureBinding> = Arena::new();
let texture_view_arena: Arena<wgc::id::TextureViewId> = 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)),
)
}
},
})

13
wgpu/src/backend/web.rs
View File

@@ -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)

5
wgpu/src/lib.rs
View File

@@ -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]),
}