nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-22 14:55:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump js-sys and web-sys to 0.3.65 (#4778)

Browse Source
This commit is contained in:
TÖRÖK Attila 2023-11-27 11:19:57 +01:00 committed by GitHub
parent 271b918e43
commit e16f7b4083
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 45 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Cargo.lock generated
View File

@ -1809,9 +1809,9 @@ dependencies = [
[[package]] [[package]]
name = "js-sys" name = "js-sys"
version = "0.3.64" version = "0.3.65"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8"
dependencies = [ dependencies = [
"wasm-bindgen", "wasm-bindgen",
] ]
@ -3553,9 +3553,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]] [[package]]
name = "wasm-bindgen" name = "wasm-bindgen"
version = "0.2.87" version = "0.2.88"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"wasm-bindgen-macro", "wasm-bindgen-macro",
@ -3563,9 +3563,9 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-backend" name = "wasm-bindgen-backend"
version = "0.2.87" version = "0.2.88"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217"
dependencies = [ dependencies = [
"bumpalo", "bumpalo",
"log", "log",
@ -3590,9 +3590,9 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-macro" name = "wasm-bindgen-macro"
version = "0.2.87" version = "0.2.88"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2"
dependencies = [ dependencies = [
"quote", "quote",
"wasm-bindgen-macro-support", "wasm-bindgen-macro-support",
@ -3600,9 +3600,9 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-macro-support" name = "wasm-bindgen-macro-support"
version = "0.2.87" version = "0.2.88"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -3613,9 +3613,9 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-shared" name = "wasm-bindgen-shared"
version = "0.2.87" version = "0.2.88"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
[[package]] [[package]]
name = "wasm-bindgen-test" name = "wasm-bindgen-test"
@ -3726,9 +3726,9 @@ dependencies = [
[[package]] [[package]]
name = "web-sys" name = "web-sys"
version = "0.3.64" version = "0.3.65"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85"
dependencies = [ dependencies = [
"js-sys", "js-sys",
"wasm-bindgen", "wasm-bindgen",
@ -3878,7 +3878,7 @@ dependencies = [
"js-sys", "js-sys",
"khronos-egl", "khronos-egl",
"libc", "libc",
"libloading 0.7.4", "libloading 0.8.1",
"log", "log",
"metal", "metal",
"naga", "naga",

4
Cargo.toml
View File

@ -149,11 +149,11 @@ glutin = "0.29.1"
# wasm32 dependencies # wasm32 dependencies
console_error_panic_hook = "0.1.7" console_error_panic_hook = "0.1.7"
console_log = "1" console_log = "1"
js-sys = "0.3.64" js-sys = "0.3.65"
wasm-bindgen = "0.2.87" wasm-bindgen = "0.2.87"
wasm-bindgen-futures = "0.4.34" wasm-bindgen-futures = "0.4.34"
wasm-bindgen-test = "0.3" wasm-bindgen-test = "0.3"
web-sys = "0.3.64" web-sys = "0.3.65"
# deno dependencies # deno dependencies
deno_console = "0.119.0" deno_console = "0.119.0"

2
wgpu-core/Cargo.toml
View File

@ -95,7 +95,7 @@ version = "0.18.0"
default_features = false default_features = false
[target.'cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))'.dependencies] [target.'cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))'.dependencies]
web-sys = { version = "0.3.64", features = [ web-sys = { version = "0.3.65", features = [
"HtmlCanvasElement", "HtmlCanvasElement",
"OffscreenCanvas", "OffscreenCanvas",
] } ] }

4
wgpu-hal/Cargo.toml
View File

@ -150,13 +150,13 @@ core-graphics-types = "0.1"
[target.'cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))'.dependencies] [target.'cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))'.dependencies]
wasm-bindgen = "0.2.87" wasm-bindgen = "0.2.87"
web-sys = { version = "0.3.64", features = [ web-sys = { version = "0.3.65", features = [
"Window", "Window",
"HtmlCanvasElement", "HtmlCanvasElement",
"WebGl2RenderingContext", "WebGl2RenderingContext",
"OffscreenCanvas", "OffscreenCanvas",
] } ] }
js-sys = "0.3.64" js-sys = "0.3.65"
[target.'cfg(unix)'.dependencies] [target.'cfg(unix)'.dependencies]
libc = "0.2" libc = "0.2"

4
wgpu-types/Cargo.toml
View File

@ -38,8 +38,8 @@ bitflags = "2"
serde = { version = "1", features = ["serde_derive"], optional = true } serde = { version = "1", features = ["serde_derive"], optional = true }
[target.'cfg(target_arch = "wasm32")'.dependencies] [target.'cfg(target_arch = "wasm32")'.dependencies]
js-sys = "0.3.64" js-sys = "0.3.65"
web-sys = { version = "0.3.64", features = [ web-sys = { version = "0.3.65", features = [
"ImageBitmap", "ImageBitmap",
"HtmlVideoElement", "HtmlVideoElement",
"HtmlCanvasElement", "HtmlCanvasElement",

2
wgpu/Cargo.toml
View File

@ -159,7 +159,7 @@ web-sys = { workspace = true, features = [
"GpuCompilationMessageType", "GpuCompilationMessageType",
"GpuComputePassDescriptor", "GpuComputePassDescriptor",
"GpuComputePassEncoder", "GpuComputePassEncoder",
"GpuComputePassTimestampWrite", "GpuComputePassTimestampWrites",
"GpuComputePipeline", "GpuComputePipeline",
"GpuComputePipelineDescriptor", "GpuComputePipelineDescriptor",
"GpuCullMode", "GpuCullMode",

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

@ -398,12 +398,14 @@ fn map_stencil_state_face(desc: &wgt::StencilFaceState) -> web_sys::GpuStencilFa
} }
fn map_depth_stencil_state(desc: &wgt::DepthStencilState) -> web_sys::GpuDepthStencilState { fn map_depth_stencil_state(desc: &wgt::DepthStencilState) -> web_sys::GpuDepthStencilState {
let mut mapped = web_sys::GpuDepthStencilState::new(map_texture_format(desc.format)); let mut mapped = web_sys::GpuDepthStencilState::new(
map_compare_function(desc.depth_compare),
desc.depth_write_enabled,
map_texture_format(desc.format),
);
mapped.depth_bias(desc.bias.constant); mapped.depth_bias(desc.bias.constant);
mapped.depth_bias_clamp(desc.bias.clamp); mapped.depth_bias_clamp(desc.bias.clamp);
mapped.depth_bias_slope_scale(desc.bias.slope_scale); mapped.depth_bias_slope_scale(desc.bias.slope_scale);
mapped.depth_compare(map_compare_function(desc.depth_compare));
mapped.depth_write_enabled(desc.depth_write_enabled);
mapped.stencil_back(&map_stencil_state_face(&desc.stencil.back)); mapped.stencil_back(&map_stencil_state_face(&desc.stencil.back));
mapped.stencil_front(&map_stencil_state_face(&desc.stencil.front)); mapped.stencil_front(&map_stencil_state_face(&desc.stencil.front));
mapped.stencil_read_mask(desc.stencil.read_mask); mapped.stencil_read_mask(desc.stencil.read_mask);
@ -2732,13 +2734,13 @@ impl crate::context::Context for Context {
offsets: &[wgt::DynamicOffset], offsets: &[wgt::DynamicOffset],
) { ) {
if offsets.is_empty() { if offsets.is_empty() {
pass_data.0.set_bind_group(index, &bind_group_data.0); pass_data.0.set_bind_group(index, Some(&bind_group_data.0));
} else { } else {
pass_data pass_data
.0 .0
.set_bind_group_with_u32_array_and_f64_and_dynamic_offsets_data_length( .set_bind_group_with_u32_array_and_f64_and_dynamic_offsets_data_length(
index, index,
&bind_group_data.0, Some(&bind_group_data.0),
offsets, offsets,
0f64, 0f64,
offsets.len() as u32, offsets.len() as u32,
@ -2861,13 +2863,15 @@ impl crate::context::Context for Context {
offsets: &[wgt::DynamicOffset], offsets: &[wgt::DynamicOffset],
) { ) {
if offsets.is_empty() { if offsets.is_empty() {
encoder_data.0.set_bind_group(index, &bind_group_data.0); encoder_data
.0
.set_bind_group(index, Some(&bind_group_data.0));
} else { } else {
encoder_data encoder_data
.0 .0
.set_bind_group_with_u32_array_and_f64_and_dynamic_offsets_data_length( .set_bind_group_with_u32_array_and_f64_and_dynamic_offsets_data_length(
index, index,
&bind_group_data.0, Some(&bind_group_data.0),
offsets, offsets,
0f64, 0f64,
offsets.len() as u32, offsets.len() as u32,
@ -2918,15 +2922,17 @@ impl crate::context::Context for Context {
Some(s) => { Some(s) => {
encoder_data.0.set_vertex_buffer_with_f64_and_f64( encoder_data.0.set_vertex_buffer_with_f64_and_f64(
slot, slot,
&buffer_data.0, Some(&buffer_data.0),
offset as f64, offset as f64,
s.get() as f64, s.get() as f64,
); );
} }
None => { None => {
encoder_data encoder_data.0.set_vertex_buffer_with_f64(
.0 slot,
.set_vertex_buffer_with_f64(slot, &buffer_data.0, offset as f64); Some(&buffer_data.0),
offset as f64,
);
} }
}; };
} }
@ -3080,13 +3086,13 @@ impl crate::context::Context for Context {
offsets: &[wgt::DynamicOffset], offsets: &[wgt::DynamicOffset],
) { ) {
if offsets.is_empty() { if offsets.is_empty() {
pass_data.0.set_bind_group(index, &bind_group_data.0); pass_data.0.set_bind_group(index, Some(&bind_group_data.0));
} else { } else {
pass_data pass_data
.0 .0
.set_bind_group_with_u32_array_and_f64_and_dynamic_offsets_data_length( .set_bind_group_with_u32_array_and_f64_and_dynamic_offsets_data_length(
index, index,
&bind_group_data.0, Some(&bind_group_data.0),
offsets, offsets,
0f64, 0f64,
offsets.len() as u32, offsets.len() as u32,
@ -3137,7 +3143,7 @@ impl crate::context::Context for Context {
Some(s) => { Some(s) => {
pass_data.0.set_vertex_buffer_with_f64_and_f64( pass_data.0.set_vertex_buffer_with_f64_and_f64(
slot, slot,
&buffer_data.0, Some(&buffer_data.0),
offset as f64, offset as f64,
s.get() as f64, s.get() as f64,
); );
@ -3145,7 +3151,7 @@ impl crate::context::Context for Context {
None => { None => {
pass_data pass_data
.0 .0
.set_vertex_buffer_with_f64(slot, &buffer_data.0, offset as f64); .set_vertex_buffer_with_f64(slot, Some(&buffer_data.0), offset as f64);
} }
}; };
} }

2
wgpu/src/lib.rs
View File

@ -1542,7 +1542,7 @@ static_assertions::assert_impl_all!(RenderPipelineDescriptor: Send, Sync);
/// For use with [`ComputePassDescriptor`]. /// For use with [`ComputePassDescriptor`].
/// At least one of `beginning_of_pass_write_index` and `end_of_pass_write_index` must be `Some`. /// At least one of `beginning_of_pass_write_index` and `end_of_pass_write_index` must be `Some`.
/// ///
/// Corresponds to [WebGPU `GPUComputePassTimestampWrite`]( /// Corresponds to [WebGPU `GPUComputePassTimestampWrites`](
/// https://gpuweb.github.io/gpuweb/#dictdef-gpucomputepasstimestampwrites). /// https://gpuweb.github.io/gpuweb/#dictdef-gpucomputepasstimestampwrites).
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct ComputePassTimestampWrites<'a> { pub struct ComputePassTimestampWrites<'a> {