From 493ff2e56497cecbfbeceba2b1c626277bb26179 Mon Sep 17 00:00:00 2001 From: Connor Fitzgerald Date: Thu, 20 Jul 2023 23:03:34 -0400 Subject: [PATCH] Bump wgpu versions --- Cargo.lock | 57 ++++++++++++++++++++++--------------------- Cargo.toml | 24 +++++++++--------- wgpu-core/Cargo.toml | 10 ++++---- wgpu-hal/Cargo.toml | 14 +++++------ wgpu-types/Cargo.toml | 2 +- 5 files changed, 54 insertions(+), 53 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 79fec50f5..6b43267ec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1473,8 +1473,9 @@ dependencies = [ [[package]] name = "metal" -version = "0.25.0" -source = "git+https://github.com/gfx-rs/metal-rs.git?rev=a6a0446#a6a04463db388e8fd3e99095ab4fbb87cbe9d69c" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "623b5e6cefd76e58f774bd3cc0c6f5c7615c58c03a97815245a25c3c9bdee318" dependencies = [ "bitflags 2.3.3", "block", @@ -1524,8 +1525,8 @@ dependencies = [ [[package]] name = "naga" -version = "0.12.0" -source = "git+https://github.com/gfx-rs/naga?rev=409239c0e2313bfd0dc4fd64f8c3021185ccef1b#409239c0e2313bfd0dc4fd64f8c3021185ccef1b" +version = "0.13.0" +source = "git+https://github.com/gfx-rs/naga?rev=bac2d82a430fbfcf100ee22b7c3bc12f3d593079#bac2d82a430fbfcf100ee22b7c3bc12f3d593079" dependencies = [ "bit-set", "bitflags 2.3.3", @@ -1906,7 +1907,7 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "player" -version = "0.16.0" +version = "0.17.0" dependencies = [ "env_logger", "log", @@ -2933,7 +2934,7 @@ dependencies = [ [[package]] name = "wgpu" -version = "0.16.0" +version = "0.17.0" dependencies = [ "arrayvec 0.7.4", "cfg-if", @@ -2956,7 +2957,7 @@ dependencies = [ [[package]] name = "wgpu-boids-example" -version = "0.16.0" +version = "0.17.0" dependencies = [ "bytemuck", "nanorand", @@ -2969,7 +2970,7 @@ dependencies = [ [[package]] name = "wgpu-bunnymark-example" -version = "0.16.0" +version = "0.17.0" dependencies = [ "bytemuck", "glam", @@ -2984,7 +2985,7 @@ dependencies = [ [[package]] name = "wgpu-capture-example" -version = "0.16.0" +version = "0.17.0" dependencies = [ "bytemuck", "console_error_panic_hook", @@ -3002,7 +3003,7 @@ dependencies = [ [[package]] name = "wgpu-conservative-raster-example" -version = "0.16.0" +version = "0.17.0" dependencies = [ "wasm-bindgen-test", "wgpu", @@ -3013,7 +3014,7 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.16.0" +version = "0.17.0" dependencies = [ "arrayvec 0.7.4", "bit-vec", @@ -3036,7 +3037,7 @@ dependencies = [ [[package]] name = "wgpu-cube-example" -version = "0.16.0" +version = "0.17.0" dependencies = [ "bytemuck", "glam", @@ -3049,7 +3050,7 @@ dependencies = [ [[package]] name = "wgpu-example" -version = "0.16.0" +version = "0.17.0" dependencies = [ "async-executor", "console_error_panic_hook", @@ -3070,7 +3071,7 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.16.0" +version = "0.17.0" dependencies = [ "android_system_properties", "arrayvec 0.7.4", @@ -3113,7 +3114,7 @@ dependencies = [ [[package]] name = "wgpu-hello-compute-example" -version = "0.16.0" +version = "0.17.0" dependencies = [ "bytemuck", "console_error_panic_hook", @@ -3131,7 +3132,7 @@ dependencies = [ [[package]] name = "wgpu-hello-example" -version = "0.16.0" +version = "0.17.0" dependencies = [ "console_error_panic_hook", "console_log", @@ -3146,7 +3147,7 @@ dependencies = [ [[package]] name = "wgpu-hello-triangle-example" -version = "0.16.0" +version = "0.17.0" dependencies = [ "bytemuck", "console_error_panic_hook", @@ -3161,7 +3162,7 @@ dependencies = [ [[package]] name = "wgpu-hello-windows-example" -version = "0.16.0" +version = "0.17.0" dependencies = [ "bytemuck", "console_error_panic_hook", @@ -3173,7 +3174,7 @@ dependencies = [ [[package]] name = "wgpu-info" -version = "0.16.0" +version = "0.17.0" dependencies = [ "anyhow", "bitflags 2.3.3", @@ -3187,7 +3188,7 @@ dependencies = [ [[package]] name = "wgpu-mipmap-example" -version = "0.16.0" +version = "0.17.0" dependencies = [ "bytemuck", "glam", @@ -3200,7 +3201,7 @@ dependencies = [ [[package]] name = "wgpu-msaa-line-example" -version = "0.16.0" +version = "0.17.0" dependencies = [ "bytemuck", "glam", @@ -3214,7 +3215,7 @@ dependencies = [ [[package]] name = "wgpu-shadow-example" -version = "0.16.0" +version = "0.17.0" dependencies = [ "bytemuck", "glam", @@ -3227,7 +3228,7 @@ dependencies = [ [[package]] name = "wgpu-skybox-example" -version = "0.16.0" +version = "0.17.0" dependencies = [ "bytemuck", "ddsfile", @@ -3243,7 +3244,7 @@ dependencies = [ [[package]] name = "wgpu-stencil-triangle-example" -version = "0.16.0" +version = "0.17.0" dependencies = [ "bytemuck", "wasm-bindgen-test", @@ -3255,7 +3256,7 @@ dependencies = [ [[package]] name = "wgpu-test" -version = "0.16.0" +version = "0.17.0" dependencies = [ "bitflags 2.3.3", "bytemuck", @@ -3280,7 +3281,7 @@ dependencies = [ [[package]] name = "wgpu-texture-arrays-example" -version = "0.16.0" +version = "0.17.0" dependencies = [ "bytemuck", "wasm-bindgen-test", @@ -3292,7 +3293,7 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.16.0" +version = "0.17.0" dependencies = [ "bitflags 2.3.3", "js-sys", @@ -3303,7 +3304,7 @@ dependencies = [ [[package]] name = "wgpu-water-example" -version = "0.16.0" +version = "0.17.0" dependencies = [ "bytemuck", "glam", diff --git a/Cargo.toml b/Cargo.toml index 1676d27d5..9c3246f67 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,28 +31,28 @@ keywords = ["graphics"] license = "MIT OR Apache-2.0" homepage = "https://wgpu.rs/" repository = "https://github.com/gfx-rs/wgpu" -version = "0.16.0" +version = "0.17.0" authors = ["wgpu developers"] [workspace.dependencies.wgc] package = "wgpu-core" path = "./wgpu-core" -version = "0.16" +version = "0.17" [workspace.dependencies.wgt] package = "wgpu-types" path = "./wgpu-types" -version = "0.16" +version = "0.17" [workspace.dependencies.hal] package = "wgpu-hal" path = "./wgpu-hal" -version = "0.16" +version = "0.17" [workspace.dependencies.naga] git = "https://github.com/gfx-rs/naga" -rev = "409239c0e2313bfd0dc4fd64f8c3021185ccef1b" -version = "0.12.0" +rev = "bac2d82a430fbfcf100ee22b7c3bc12f3d593079" +version = "0.13.0" [workspace.dependencies] anyhow = "1.0" @@ -93,14 +93,16 @@ serde_json = "1.0.96" smallvec = "1" static_assertions = "1.1.0" thiserror = "1" -wgpu = { version = "0.16", path = "./wgpu" } -wgpu-example = { version = "0.16", path = "./examples/common" } -wgpu-test = { version = "0.16", path = "./tests"} +wgpu = { version = "0.17.0", path = "./wgpu" } +wgpu-core = { version = "0.17.0", path = "./wgpu-core" } +wgpu-example = { version = "0.17.0", path = "./examples/common" } +wgpu-test = { version = "0.17", path = "./tests"} +wgpu-types = { version = "0.17.0", path = "./wgpu-types" } winit = "0.27.1" # Metal dependencies block = "0.1" -metal = "0.25.0" +metal = "0.26.0" objc = "0.2.5" core-graphics-types = "0.1" @@ -141,8 +143,6 @@ deno_webidl = "0.106.0" deno_webgpu = { path = "./deno_webgpu" } tokio = "1.28.2" termcolor = "1.2.0" -wgpu-core = { path = "./wgpu-core" } -wgpu-types = { path = "./wgpu-types" } [patch."https://github.com/gfx-rs/naga"] #naga = { path = "../naga" } diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml index b6b88f92e..dc5352979 100644 --- a/wgpu-core/Cargo.toml +++ b/wgpu-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wgpu-core" -version = "0.16.0" +version = "0.17.0" authors = ["wgpu developers"] edition = "2021" description = "WebGPU core logic on wgpu-hal" @@ -72,19 +72,19 @@ thiserror = "1" [dependencies.naga] git = "https://github.com/gfx-rs/naga" -rev = "409239c0e2313bfd0dc4fd64f8c3021185ccef1b" -version = "0.12.0" +rev = "bac2d82a430fbfcf100ee22b7c3bc12f3d593079" +version = "0.13.0" features = ["clone", "span", "validate"] [dependencies.wgt] package = "wgpu-types" path = "../wgpu-types" -version = "0.16" +version = "0.17" [dependencies.hal] package = "wgpu-hal" path = "../wgpu-hal" -version = "0.16" +version = "0.17" default_features = false [target.'cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))'.dependencies] diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml index 5288c4255..04459488c 100644 --- a/wgpu-hal/Cargo.toml +++ b/wgpu-hal/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wgpu-hal" -version = "0.16.0" +version = "0.17.0" authors = ["wgpu developers"] edition = "2021" description = "WebGPU hardware abstraction layer" @@ -71,7 +71,7 @@ glow = { version = "0.12.3", optional = true } [dependencies.wgt] package = "wgpu-types" path = "../wgpu-types" -version = "0.16" +version = "0.17" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] # backend: Vulkan @@ -103,7 +103,7 @@ d3d12 = { version = "0.7", features = ["libloading"], optional = true } # backend: Metal block = { version = "0.1", optional = true } -metal = { git = "https://github.com/gfx-rs/metal-rs.git", rev = "a6a0446", default_features = false } +metal = { version = "0.26.0", default_features = false } objc = "0.2.5" core-graphics-types = "0.1" @@ -120,15 +120,15 @@ android_system_properties = "0.1.1" [dependencies.naga] git = "https://github.com/gfx-rs/naga" -rev = "409239c0e2313bfd0dc4fd64f8c3021185ccef1b" -version = "0.12.0" +rev = "bac2d82a430fbfcf100ee22b7c3bc12f3d593079" +version = "0.13.0" features = ["clone"] # DEV dependencies [dev-dependencies.naga] git = "https://github.com/gfx-rs/naga" -rev = "409239c0e2313bfd0dc4fd64f8c3021185ccef1b" -version = "0.12.0" +rev = "bac2d82a430fbfcf100ee22b7c3bc12f3d593079" +version = "0.13.0" features = ["wgsl-in"] [dev-dependencies] diff --git a/wgpu-types/Cargo.toml b/wgpu-types/Cargo.toml index e5cfbf2b6..a782b34dc 100644 --- a/wgpu-types/Cargo.toml +++ b/wgpu-types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wgpu-types" -version = "0.16.0" +version = "0.17.0" authors = ["wgpu developers"] edition = "2021" description = "WebGPU types"