From 6a2bd48a4c0c5dd1ddd0360723c2a5133ba2ee97 Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Wed, 18 Aug 2021 00:51:55 -0400 Subject: [PATCH] Release v0.10 --- CHANGELOG.md | 22 ++++++++++++--- Cargo.lock | 50 ++++++++++++++++++--------------- wgpu-core/Cargo.toml | 11 ++++---- wgpu-hal/Cargo.toml | 30 ++++++++++++-------- wgpu-hal/src/vulkan/adapter.rs | 6 +--- wgpu-hal/src/vulkan/command.rs | 6 +--- wgpu-hal/src/vulkan/device.rs | 6 +--- wgpu-hal/src/vulkan/instance.rs | 1 - wgpu-hal/src/vulkan/mod.rs | 1 - wgpu-info/Cargo.toml | 4 +-- wgpu-types/Cargo.toml | 2 +- wgpu/Cargo.toml | 14 +++++---- 12 files changed, 84 insertions(+), 69 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e09667ae..e1cb97dc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,9 @@ # Change Log -## Unreleased +## v0.10 (2021-08-18) - Infrastructure: - - `gfx-hal` is replaced by the in-house graphics abstraction `wgpu-hal`. Backends: Vulkan, Metal, OpenGL ES-3. + - `gfx-hal` is replaced by the in-house graphics abstraction `wgpu-hal`. Backends: Vulkan, Metal, D3D-12, and OpenGL ES-3. + - examples are tested automatically for image snapshots. - API: - `cross` feature is removed entirely. Only Rust code from now on. - processing SPIR-V inputs for later translation now requires `spirv` compile feature enabled @@ -10,11 +11,24 @@ - several bitflag names are renamed to plural: `TextureUsage`, `BufferUsage`, `ColorWrite`. - the `SwapChain` is merged into `Surface`. Returned frames are `Texture` instead of `TextureView`. - renamed `TextureUsage` bits: `SAMPLED` -> `TEXTURE_BINDING`, `STORAGE` -> `STORAGE_BINDING`. - - renamed `InputStepMode` to `VertexStepMode` - - Implemented `Rgb9e5Ufloat` format. + - renamed `InputStepMode` to `VertexStepMode`. + - readable storage textures are no longer a part of the base API. Only exposed via format-specific features, non-portably. + - implemented `Rgb9e5Ufloat` format. + - added limits for binding sizes, vertex data, per-stage bindings, and others. + - reworked downlevel flags, added downlevel limits. + - `resolver = "2"` is now required in top-level cargo manifests - Fixed: - `Device::create_query_set` would return an error when creating exactly `QUERY_SET_MAX_QUERIES` (8192) queries. Now it only returns an error when trying to create *more* than `QUERY_SET_MAX_QUERIES` queries. +## wgpu-core-0.9.2 + - fix `Features::TEXTURE_SPECIFIC_FORMAT_FEATURES` not being supported for rendertargets + +## wgpu-core-0.9.1 (2021-07-13) + - fix buffer inits delayed by a frame + - fix query resolves to initialize buffers + - fix pipeline statistics stride + - fix the check for maximum query count + ## v0.9 (2021-06-18) - Updated: - naga to `v0.5`. diff --git a/Cargo.lock b/Cargo.lock index a622c81c3..be939fda2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -62,9 +62,9 @@ dependencies = [ [[package]] name = "ash" -version = "0.32.1" +version = "0.33.0+1.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06063a002a77d2734631db74e8f4ce7148b77fe522e6bca46f2ae7774fd48112" +checksum = "a2142f1fa77cc4d24ffd2f24dc84f88ce5b1e588d524f10fb473a04b93aef14f" dependencies = [ "libloading 0.7.0", ] @@ -458,8 +458,9 @@ dependencies = [ [[package]] name = "d3d12" -version = "0.4.0" -source = "git+https://github.com/gfx-rs/d3d12-rs?rev=79f29c8#79f29c8809d3dc4f97785815567e5efda20e639a" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2daefd788d1e96e0a9d66dee4b828b883509bc3ea9ce30665f04c3246372690c" dependencies = [ "bitflags", "libloading 0.7.0", @@ -679,8 +680,9 @@ dependencies = [ [[package]] name = "glow" -version = "0.10.0" -source = "git+https://github.com/grovesNL/glow?rev=0864897a28bbdd43f89f4fd8fdd4ed781b719f8a#0864897a28bbdd43f89f4fd8fdd4ed781b719f8a" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f04649123493bc2483cbef4daddb45d40bbdae5adb221a63a23efdb0cc99520" dependencies = [ "js-sys", "slotmap", @@ -690,9 +692,9 @@ dependencies = [ [[package]] name = "gpu-alloc" -version = "0.4.7" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc1b6ca374e81862526786d9cb42357ce03706ed1b8761730caafd02ab91f3a" +checksum = "c481459c44304a1dfed23bd650bb3912e12c9f77d7871f86d7ed7c9730a52e79" dependencies = [ "bitflags", "gpu-alloc-types", @@ -709,9 +711,9 @@ dependencies = [ [[package]] name = "gpu-descriptor" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a70f1e87a3840ed6a3e99e02c2b861e4dbdf26f0d07e38f42ea5aff46cfce2" +checksum = "d7a237f0419ab10d17006d55c62ac4f689a6bf52c75d3f38b8361d249e8d4b0b" dependencies = [ "bitflags", "gpu-descriptor-types", @@ -907,8 +909,9 @@ dependencies = [ [[package]] name = "metal" -version = "0.22.0" -source = "git+https://github.com/gfx-rs/metal-rs?rev=08cc15a3be5a57fc07bb27091eff3569dd60cfd3#08cc15a3be5a57fc07bb27091eff3569dd60cfd3" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79d7d769f1c104b8388294d6594d491d2e21240636f5f94d37f8a0f3d7904450" dependencies = [ "bitflags", "block", @@ -963,8 +966,9 @@ dependencies = [ [[package]] name = "naga" -version = "0.5.0" -source = "git+https://github.com/gfx-rs/naga?rev=4e181d6#4e181d6af4b758c11482b633b3a54b58bfbd4a59" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c70938c43114c164e8ef86e608b39e68d3e4c8bca25e105bf4a3e788042a804a" dependencies = [ "bit-set", "bitflags", @@ -975,7 +979,7 @@ dependencies = [ "petgraph", "rose_tree", "serde", - "spirv_headers", + "spirv", "thiserror", ] @@ -1506,10 +1510,10 @@ dependencies = [ ] [[package]] -name = "spirv_headers" -version = "1.5.0" +name = "spirv" +version = "0.2.0+1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f5b132530b1ac069df335577e3581765995cba5a13995cdbbdbc8fb057c532c" +checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" dependencies = [ "bitflags", "num-traits 0.2.14", @@ -1768,7 +1772,7 @@ dependencies = [ [[package]] name = "wgpu" -version = "0.9.0" +version = "0.10.0" dependencies = [ "arrayvec", "async-executor", @@ -1802,7 +1806,7 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.9.0" +version = "0.10.0" dependencies = [ "arrayvec", "bitflags", @@ -1824,7 +1828,7 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.9.0" +version = "0.10.0" dependencies = [ "arrayvec", "ash", @@ -1858,7 +1862,7 @@ dependencies = [ [[package]] name = "wgpu-info" -version = "0.9.0" +version = "0.10.0" dependencies = [ "env_logger", "wgpu", @@ -1866,7 +1870,7 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.9.0" +version = "0.10.0" dependencies = [ "bitflags", "serde", diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml index aa9ddb4e5..4bf1f1262 100644 --- a/wgpu-core/Cargo.toml +++ b/wgpu-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wgpu-core" -version = "0.9.0" +version = "0.10.0" authors = ["wgpu developers"] edition = "2018" description = "WebGPU core logic on gfx-hal" @@ -35,19 +35,20 @@ smallvec = "1" thiserror = "1" [dependencies.naga] -git = "https://github.com/gfx-rs/naga" -rev = "4e181d6" +#git = "https://github.com/gfx-rs/naga" +#rev = "4e181d6" +version = "0.6" features = ["wgsl-in"] [dependencies.wgt] path = "../wgpu-types" package = "wgpu-types" -version = "0.9" +version = "0.10" [dependencies.hal] path = "../wgpu-hal" package = "wgpu-hal" -version = "0.9" +version = "0.10" [target.'cfg(all(not(target_arch = "wasm32"), any(target_os = "ios", target_os = "macos")))'.dependencies] hal = { path = "../wgpu-hal", package = "wgpu-hal", features = ["metal"] } diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml index d5092cc0d..d4eb106a4 100644 --- a/wgpu-hal/Cargo.toml +++ b/wgpu-hal/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wgpu-hal" -version = "0.9.0" +version = "0.10.0" authors = ["wgpu developers"] edition = "2018" description = "WebGPU hardware abstraction layer" @@ -24,7 +24,6 @@ bitflags = "1.0" parking_lot = "0.11" raw-window-handle = "0.3" thiserror = "1" -wgt = { package = "wgpu-types", path = "../wgpu-types" } # backends common arrayvec = "0.7" @@ -37,18 +36,23 @@ block = { version = "0.1", optional = true } foreign-types = { version = "0.3", optional = true } # backend: Vulkan -ash = { version = "0.32", optional = true } -gpu-alloc = { version = "0.4", optional = true } -gpu-descriptor = { version = "0.1", optional = true } +ash = { version = "0.33", optional = true } +gpu-alloc = { version = "0.5", optional = true } +gpu-descriptor = { version = "0.2", optional = true } inplace_it = { version ="0.3.3", optional = true } # backend: Gles -glow = { git = "https://github.com/grovesNL/glow", rev = "0864897a28bbdd43f89f4fd8fdd4ed781b719f8a", optional = true } +glow = { version = "0.11", optional = true } # backend: Dx12 bit-set = { version = "0.5", optional = true } range-alloc = { version = "0.1", optional = true } +[dependencies.wgt] +package = "wgpu-types" +path = "../wgpu-types" +version = "0.10" + [target.'cfg(not(target_arch = "wasm32"))'.dependencies] egl = { package = "khronos-egl", version = "4.1", features = ["dynamic"], optional = true } #Note: it's only unused on Apple platforms @@ -56,20 +60,22 @@ libloading = { version = "0.7", optional = true } [target.'cfg(windows)'.dependencies] winapi = { version = "0.3", features = ["libloaderapi", "windef", "winuser"] } -native = { package = "d3d12", git = "https://github.com/gfx-rs/d3d12-rs", rev = "79f29c8", features = ["libloading"], optional = true } +native = { package = "d3d12", version = "0.4.1", features = ["libloading"], optional = true } [target.'cfg(any(target_os="macos", target_os="ios"))'.dependencies] -mtl = { package = "metal", version = "0.22", git="https://github.com/gfx-rs/metal-rs", rev="08cc15a3be5a57fc07bb27091eff3569dd60cfd3" } +mtl = { package = "metal", version = "0.23" } objc = "0.2.5" core-graphics-types = "0.1" [dependencies.naga] -git = "https://github.com/gfx-rs/naga" -rev = "4e181d6" +#git = "https://github.com/gfx-rs/naga" +#rev = "4e181d6" +version = "0.6" [dev-dependencies.naga] -git = "https://github.com/gfx-rs/naga" -rev = "4e181d6" +#git = "https://github.com/gfx-rs/naga" +#rev = "4e181d6" +version = "0.6" features = ["wgsl-in"] [dev-dependencies] diff --git a/wgpu-hal/src/vulkan/adapter.rs b/wgpu-hal/src/vulkan/adapter.rs index f6e84cd36..748fd1647 100644 --- a/wgpu-hal/src/vulkan/adapter.rs +++ b/wgpu-hal/src/vulkan/adapter.rs @@ -1,10 +1,6 @@ use super::conv; -use ash::{ - extensions::khr, - version::{DeviceV1_0, InstanceV1_0}, - vk, -}; +use ash::{extensions::khr, vk}; use parking_lot::Mutex; use std::{ffi::CStr, mem, ptr, sync::Arc}; diff --git a/wgpu-hal/src/vulkan/command.rs b/wgpu-hal/src/vulkan/command.rs index 8075ac559..02a1a29b8 100644 --- a/wgpu-hal/src/vulkan/command.rs +++ b/wgpu-hal/src/vulkan/command.rs @@ -1,11 +1,7 @@ use super::conv; use arrayvec::ArrayVec; -use ash::{ - extensions::ext, - version::{DeviceV1_0, DeviceV1_2}, - vk, -}; +use ash::{extensions::ext, vk}; use inplace_it::inplace_or_alloc_from_iter; use std::{mem, ops::Range, slice}; diff --git a/wgpu-hal/src/vulkan/device.rs b/wgpu-hal/src/vulkan/device.rs index 5e940dea4..619dffb7a 100644 --- a/wgpu-hal/src/vulkan/device.rs +++ b/wgpu-hal/src/vulkan/device.rs @@ -1,11 +1,7 @@ use super::conv; use arrayvec::ArrayVec; -use ash::{ - extensions::khr, - version::{DeviceV1_0, DeviceV1_2}, - vk, -}; +use ash::{extensions::khr, vk}; use inplace_it::inplace_or_alloc_from_iter; use parking_lot::Mutex; diff --git a/wgpu-hal/src/vulkan/instance.rs b/wgpu-hal/src/vulkan/instance.rs index 2cf02ce39..9aaed7a95 100644 --- a/wgpu-hal/src/vulkan/instance.rs +++ b/wgpu-hal/src/vulkan/instance.rs @@ -8,7 +8,6 @@ use std::{ use ash::{ extensions::{ext, khr}, - version::{DeviceV1_0 as _, EntryV1_0 as _, InstanceV1_0 as _}, vk, }; diff --git a/wgpu-hal/src/vulkan/mod.rs b/wgpu-hal/src/vulkan/mod.rs index 2e49f2be4..9dc3546a8 100644 --- a/wgpu-hal/src/vulkan/mod.rs +++ b/wgpu-hal/src/vulkan/mod.rs @@ -36,7 +36,6 @@ use std::{borrow::Borrow, ffi::CStr, sync::Arc}; use arrayvec::ArrayVec; use ash::{ extensions::{ext, khr}, - version::{DeviceV1_0, DeviceV1_2}, vk, }; use parking_lot::Mutex; diff --git a/wgpu-info/Cargo.toml b/wgpu-info/Cargo.toml index 35fe8a9c1..866567c02 100644 --- a/wgpu-info/Cargo.toml +++ b/wgpu-info/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wgpu-info" -version = "0.9.0" +version = "0.10.0" authors = ["wgpu developers"] edition = "2018" description = "Adapter information and per-adapter test program" @@ -11,4 +11,4 @@ license = "MIT OR Apache-2.0" [dependencies] env_logger = "0.8" -wgpu = { version = "0.9", path = "../wgpu" } +wgpu = { version = "0.10", path = "../wgpu" } diff --git a/wgpu-types/Cargo.toml b/wgpu-types/Cargo.toml index e5610b607..cb93c7297 100644 --- a/wgpu-types/Cargo.toml +++ b/wgpu-types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wgpu-types" -version = "0.9.0" +version = "0.10.0" authors = ["wgpu developers"] edition = "2018" description = "WebGPU types" diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index a62ad172f..0251b6db2 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wgpu" -version = "0.9.0" +version = "0.10.0" authors = ["wgpu developers"] edition = "2018" description = "Rusty WebGPU API wrapper" @@ -41,10 +41,12 @@ optional = true [dependencies.wgt] package = "wgpu-types" path = "../wgpu-types" +version = "0.10" [target.'cfg(not(target_arch = "wasm32"))'.dependencies.hal] package = "wgpu-hal" path = "../wgpu-hal" +version = "0.10" [dependencies] arrayvec = "0.7" @@ -74,14 +76,16 @@ pollster = "0.2" env_logger = "0.8" [dependencies.naga] -git = "https://github.com/gfx-rs/naga" -rev = "4e181d6" +#git = "https://github.com/gfx-rs/naga" +#rev = "4e181d6" +version = "0.6" optional = true # used to test all the example shaders [dev-dependencies.naga] -git = "https://github.com/gfx-rs/naga" -rev = "4e181d6" +#git = "https://github.com/gfx-rs/naga" +#rev = "4e181d6" +version = "0.6" features = ["wgsl-in"] [[example]]