From c2f98b612abb55e0eb453ebd87c2cff218d7cf67 Mon Sep 17 00:00:00 2001 From: Eduard-Mihai Burtescu Date: Tue, 25 Jul 2023 12:25:05 +0300 Subject: [PATCH] Bump version to `0.9.0`. --- CHANGELOG.md | 2 ++ Cargo.lock | 21 +++++++++++---------- Cargo.toml | 17 +++++++---------- crates/rustc_codegen_spirv/Cargo.toml | 2 +- crates/spirv-builder/README.md | 1 + docs/src/writing-shader-crates.md | 4 ++-- 6 files changed, 24 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7aa18accd4..6ef4fd99b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.9.0] + ### Added ⭐ - [PR#1082](https://github.com/EmbarkStudios/rust-gpu/pull/1082) added partial support for extracting `format_args!` from `panic!`s, and converting them to diff --git a/Cargo.lock b/Cargo.lock index 065dfe5ca2..cfd1bc3707 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2016,7 +2016,7 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_codegen_spirv" -version = "0.8.0" +version = "0.9.0" dependencies = [ "ar", "either", @@ -2045,7 +2045,7 @@ dependencies = [ [[package]] name = "rustc_codegen_spirv-types" -version = "0.8.0" +version = "0.9.0" dependencies = [ "rspirv", "serde", @@ -2175,9 +2175,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" @@ -2279,8 +2279,9 @@ dependencies = [ [[package]] name = "spirt" -version = "0.2.0" -source = "git+https://github.com/EmbarkStudios/spirt?branch=main#82daf2516710504986cdc35e0e27455326aeef90" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e1f7903720ff818d6da824edf2c4082c6e7a029a99317fd10c39dd7c40c7ff" dependencies = [ "arrayvec", "bytemuck", @@ -2309,7 +2310,7 @@ dependencies = [ [[package]] name = "spirv-builder" -version = "0.8.0" +version = "0.9.0" dependencies = [ "memchr", "notify", @@ -2322,7 +2323,7 @@ dependencies = [ [[package]] name = "spirv-std" -version = "0.8.0" +version = "0.9.0" dependencies = [ "bitflags 1.3.2", "glam", @@ -2333,7 +2334,7 @@ dependencies = [ [[package]] name = "spirv-std-macros" -version = "0.8.0" +version = "0.9.0" dependencies = [ "proc-macro2", "quote", @@ -2343,7 +2344,7 @@ dependencies = [ [[package]] name = "spirv-std-types" -version = "0.8.0" +version = "0.9.0" [[package]] name = "spirv-tools" diff --git a/Cargo.toml b/Cargo.toml index d3d4a5886d..70f266ee50 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,19 +24,19 @@ members = [ ] [workspace.package] -version = "0.8.0" +version = "0.9.0" authors = ["Embark "] edition = "2021" license = "MIT OR Apache-2.0" repository = "https://github.com/EmbarkStudios/rust-gpu" [workspace.dependencies] -spirv-std = { path = "./crates/spirv-std", version = "=0.8.0" } -spirv-std-types = { path = "./crates/spirv-std/shared", version = "=0.8.0" } -spirv-std-macros = { path = "./crates/spirv-std/macros", version = "=0.8.0" } -spirv-builder = { path = "./crates/spirv-builder", version = "=0.8.0", default-features = false } -rustc_codegen_spirv = { path = "./crates/rustc_codegen_spirv", version = "=0.8.0", default-features = false } -rustc_codegen_spirv-types = { path = "./crates/rustc_codegen_spirv-types", version = "=0.8.0" } +spirv-std = { path = "./crates/spirv-std", version = "=0.9.0" } +spirv-std-types = { path = "./crates/spirv-std/shared", version = "=0.9.0" } +spirv-std-macros = { path = "./crates/spirv-std/macros", version = "=0.9.0" } +spirv-builder = { path = "./crates/spirv-builder", version = "=0.9.0", default-features = false } +rustc_codegen_spirv = { path = "./crates/rustc_codegen_spirv", version = "=0.9.0", default-features = false } +rustc_codegen_spirv-types = { path = "./crates/rustc_codegen_spirv-types", version = "=0.9.0" } # Enable incremental by default in release mode. [profile.release] @@ -52,6 +52,3 @@ codegen-units = 256 opt-level = 3 incremental = true codegen-units = 256 - -[patch.crates-io] -spirt = { git = "https://github.com/EmbarkStudios/spirt", branch = "main" } diff --git a/crates/rustc_codegen_spirv/Cargo.toml b/crates/rustc_codegen_spirv/Cargo.toml index 953a09edb2..4b94d02edf 100644 --- a/crates/rustc_codegen_spirv/Cargo.toml +++ b/crates/rustc_codegen_spirv/Cargo.toml @@ -58,7 +58,7 @@ serde_json = "1.0" smallvec = { version = "1.6.1", features = ["union"] } spirv-tools = { version = "0.9", default-features = false } rustc_codegen_spirv-types.workspace = true -spirt = "0.2.0" +spirt = "0.3.0" lazy_static = "1.4.0" itertools = "0.10.5" diff --git a/crates/spirv-builder/README.md b/crates/spirv-builder/README.md index 7914757079..5a3fe73074 100644 --- a/crates/spirv-builder/README.md +++ b/crates/spirv-builder/README.md @@ -37,6 +37,7 @@ Rust toolchain version history across [rust-gpu releases](https://github.com/Emb |`spirv-builder`
version|Rust toolchain
version| |:-:|:-:| +|`0.9`|`nightly-2023-05-27`| |`0.8`|`nightly-2023-04-15`| |`0.7`|`nightly-2023-03-04`| |`0.6`|`nightly-2023-01-21`| diff --git a/docs/src/writing-shader-crates.md b/docs/src/writing-shader-crates.md index d7f9409016..96a2757777 100644 --- a/docs/src/writing-shader-crates.md +++ b/docs/src/writing-shader-crates.md @@ -41,7 +41,7 @@ crates to display, it's recommended to use `spirv-builder` in a build script. 2. Reference `spirv-builder` in your Cargo.toml: ```toml [build-dependencies] - spirv-builder = "0.8" + spirv-builder = "0.9" ``` All dependent crates are published on [crates.io](https://crates.io). 3. Create a `build.rs` in your project root. @@ -153,7 +153,7 @@ Configure your shader crate as a `"dylib"` type crate, and add `spirv-std` to it crate-type = ["dylib"] [dependencies] -spirv-std = { version = "0.8" } +spirv-std = { version = "0.9" } ``` Make sure your shader code uses the `no_std` attribute and makes the `spirv` attribute visibile in the global scope. Then, you're ready to write your first shader. Here's a very simple fragment shader called `main_fs` as an example that outputs the color red: