Skip to content

Commit

Permalink
Merge branch 'master' into mapped_buffer_dont_panic
Browse files Browse the repository at this point in the history
  • Loading branch information
crowlKats authored Jan 15, 2023
2 parents 0fbf6a7 + fac4731 commit bf4ac7b
Show file tree
Hide file tree
Showing 35 changed files with 243 additions and 195 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ Additionally `Surface::get_default_config` now returns an Option and returns Non
- Add missing `DEPTH_BIAS_CLAMP` and `FULL_DRAW_INDEX_UINT32` downlevel flags. By @teoxoy in [#3316](https://github.com/gfx-rs/wgpu/pull/3316)
- Make `ObjectId` structure and invariants idiomatic. By @teoxoy in [#3347](https://github.com/gfx-rs/wgpu/pull/3347)
- Add validation in accordance with WebGPU `GPUSamplerDescriptor` valid usage for `lodMinClamp` and `lodMaxClamp`. By @James2022-rgb in [#3353](https://github.com/gfx-rs/wgpu/pull/3353)
- Remove panics in `Deref` implementations for `QueueWriteBufferView` and `BufferViewMut`. Instead, warnings are logged, since reading from these types is not recommended. By @botahamec in [#3336]

#### WebGPU

Expand All @@ -133,6 +134,12 @@ Additionally `Surface::get_default_config` now returns an Option and returns Non
#### GLES

- Browsers that support `OVR_multiview2` now report the `MULTIVIEW` feature by @expenses in [#3121](https://github.com/gfx-rs/wgpu/pull/3121).
- `Limits::max_push_constant_size` on GLES is now 256 by @Dinnerbone in [#3374](https://github.com/gfx-rs/wgpu/pull/3374).

#### Vulkan

- Set `WEBGPU_TEXTURE_FORMAT_SUPPORT` downlevel flag depending on the proper format support by @teoxoy in [#3367](https://github.com/gfx-rs/wgpu/pull/3367).
- Set `COPY_SRC`/`COPY_DST` only based on Vulkan's `TRANSFER_SRC`/`TRANSFER_DST` by @teoxoy in [#3366](https://github.com/gfx-rs/wgpu/pull/3366).

### Added/New Features

Expand Down Expand Up @@ -174,6 +181,7 @@ Additionally `Surface::get_default_config` now returns an Option and returns Non
- Evaluate `gfx_select!`'s `#[cfg]` conditions at the right time. By @jimblandy in [#3253](https://github.com/gfx-rs/wgpu/pull/3253)
- Improve error messages when binding bind group with dynamic offsets. By @cwfitzgerald in [#3294](https://github.com/gfx-rs/wgpu/pull/3294)
- Allow non-filtering sampling of integer textures. By @JMS55 in [#3362](https://github.com/gfx-rs/wgpu/pull/3362).
- Validate texture ids in `Global::queue_texture_write`. By @jimblandy in [#3378](https://github.com/gfx-rs/wgpu/pull/3378).
- Don't panic on mapped buffer in queue_submit. By @crowlKats in [#3364](https://github.com/gfx-rs/wgpu/pull/3364).

#### Metal
Expand All @@ -187,6 +195,7 @@ Additionally `Surface::get_default_config` now returns an Option and returns Non

- Fixed WebGL not displaying srgb targets correctly if a non-screen filling viewport was previously set. By @Wumpf in [#3093](https://github.com/gfx-rs/wgpu/pull/3093)
- Fix disallowing multisampling for float textures if otherwise supported. By @Wumpf in [#3183](https://github.com/gfx-rs/wgpu/pull/3183)
- Fix a panic when creating a pipeline with opaque types other than samplers (images and atomic counters). By @James2022-rgb in [#3361](https://github.com/gfx-rs/wgpu/pull/3361)

#### Vulkan

Expand Down
59 changes: 29 additions & 30 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ path = "./wgpu-hal"

[workspace.dependencies.naga]
git = "https://github.com/gfx-rs/naga"
rev = "e7fc8e6"
rev = "e98bd92"
version = "0.10"

[workspace.dependencies]
Expand Down Expand Up @@ -89,7 +89,7 @@ objc = "0.2.5"
core-graphics-types = "0.1"

# Vulkan dependencies
ash = "0.37.1"
ash = "0.37.2"
gpu-alloc = "0.5"
gpu-descriptor = "0.2"
android_system_properties = "0.1.1"
Expand Down Expand Up @@ -118,11 +118,11 @@ wasm-bindgen-test = "0.3"
web-sys = "0.3.60"

# deno dependencies
deno_console = "0.80.0"
deno_core = "0.162.0"
deno_url = "0.80.0"
deno_web = "0.111.0"
deno_webidl = "0.80.0"
deno_console = "0.84.0"
deno_core = "0.166.0"
deno_url = "0.84.0"
deno_web = "0.115.0"
deno_webidl = "0.84.0"
deno_webgpu = { path = "./deno_webgpu" }
tokio = "1.19.0"
termcolor = "1.1.2"
Expand Down
2 changes: 1 addition & 1 deletion cts_runner/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ async fn run() -> Result<(), AnyError> {
}

fn extension() -> deno_core::Extension {
deno_core::Extension::builder()
deno_core::Extension::builder("bootstrap")
.ops(vec![
op_exit::decl(),
op_read_file_sync::decl(),
Expand Down
4 changes: 2 additions & 2 deletions deno_webgpu/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Copyright 2018-2022 the Deno authors. All rights reserved. MIT license.
# Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.

[package]
name = "deno_webgpu"
version = "0.81.0"
version = "0.85.0"
authors = ["the Deno authors"]
edition.workspace = true
license = "MIT"
Expand Down
2 changes: 1 addition & 1 deletion deno_webgpu/LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright 2018-2022 the Deno authors
Copyright 2018-2023 the Deno authors

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
Loading

0 comments on commit bf4ac7b

Please sign in to comment.