Release v0.4.0-alpha.11 (#702)

EmbarkStudios · Aug 2, 2021 · 819365c · 819365c
1 parent 62799d0
commit 819365c
Show file tree

Hide file tree

Showing 24 changed files with 76 additions and 57 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/rustc_codegen_spirv/Cargo.toml b/crates/rustc_codegen_spirv/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rustc_codegen_spirv"
-version = "0.4.0-alpha.10"
+version = "0.4.0-alpha.11"
 authors = ["Embark <[email protected]>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

diff --git a/crates/spirv-builder/Cargo.toml b/crates/spirv-builder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "spirv-builder"
-version = "0.4.0-alpha.10"
+version = "0.4.0-alpha.11"
 authors = ["Embark <[email protected]>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

diff --git a/crates/spirv-std/Cargo.toml b/crates/spirv-std/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "spirv-std"
-version = "0.4.0-alpha.10"
+version = "0.4.0-alpha.11"
 authors = ["Embark <[email protected]>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"
@@ -10,9 +10,9 @@ description = "Standard functions and types for SPIR-V"
 [dependencies]
 bitflags = "1.2.1"
 num-traits = { version = "0.2.14", default-features = false, features = ["libm"] }
-spirv-types = { path = "./shared", version = "0.4.0-alpha.10" }
-spirv-std-macros = { path = "./macros", version = "0.4.0-alpha.10" }
-glam = { version = "0.16.0", default-features = false, features = ["libm"], optional = true }
+spirv-types = { path = "./shared", version = "0.4.0-alpha.11" }
+spirv-std-macros = { path = "./macros", version = "0.4.0-alpha.11" }
+glam = { version = "0.17.0", default-features = false, features = ["libm"], optional = true }
 
 [features]
 default = []
diff --git a/crates/spirv-std/macros/Cargo.toml b/crates/spirv-std/macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "spirv-std-macros"
-version = "0.4.0-alpha.10"
+version = "0.4.0-alpha.11"
 authors = ["Embark <[email protected]>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"
@@ -11,7 +11,7 @@ description = "Macros for spirv-std"
 proc-macro = true
 
 [dependencies]
-spirv-types = { path = "../shared", version = "0.4.0-alpha.10" }
+spirv-types = { path = "../shared", version = "0.4.0-alpha.11" }
 heck = "0.3.2"
 proc-macro2 = "1.0.24"
 quote = "1.0.8"

diff --git a/crates/spirv-std/shared/Cargo.toml b/crates/spirv-std/shared/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "spirv-types"
 description = "SPIR-V types shared between spirv-std and spirv-std-macros"
-version = "0.4.0-alpha.10"
+version = "0.4.0-alpha.11"
 authors = ["Embark <[email protected]>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

diff --git a/docs/src/SUMMARY.md b/docs/src/SUMMARY.md
@@ -6,6 +6,7 @@
     - [Testing](./testing.md)
     - [Environment variables Rust-GPU reads](./compiler-env-vars.md)
     - [Minimizing bugs in SPIR-V](./spirv-minimization.md)
+    - [Publishing rust-gpu on crates.io](./publishing-rust-gpu.md)
 - [Platform Support](./platform-support.md)
 - [Writing Shader Crates](./writing-shader-crates.md)
 - [Features]()

diff --git a/docs/src/publishing-rust-gpu.md b/docs/src/publishing-rust-gpu.md
@@ -0,0 +1,17 @@
+# Publishing rust-gpu on crates.io
+
+This is a task list for the maintainers of rust-gpu to remember to do when publishing a new version
+of rust-gpu (probably not useful for contributors without access to embark's crates.io account :P)
+
+1. Bump all the versions in rust-gpu to the next one. I've found this command to be useful:
+`rg --files-with-matches alpha | xargs sed -i 's/0.4.0-alpha.10/0.4.0-alpha.11/g'` (replacing with
+whatever versions are relevant)
+2. Create a PR with that change. Wait for CI and a review, and merge it.
+3. Pull the merged `main` branch.
+4. Tag `main` with the version: `git tag v0.4.0-alpha.11`
+5. Push the tag: `git push origin v0.4.0-alpha.11`
+6. Publish the crates: `cd [crate] && cargo publish` (make sure `.cargo/credentials` is set to
+embark's token) - crates to be published, in order:
+   1. crates/spirv-std/shared
+   2. crates/spirv-std/macros
+   3. crates/spirv-std
diff --git a/examples/multibuilder/Cargo.toml b/examples/multibuilder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multibuilder"
-version = "0.4.0-alpha.10"
+version = "0.4.0-alpha.11"
 authors = ["Embark <[email protected]>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

diff --git a/examples/runners/ash/Cargo.toml b/examples/runners/ash/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "example-runner-ash"
-version = "0.4.0-alpha.10"
+version = "0.4.0-alpha.11"
 authors = ["Embark <[email protected]>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

diff --git a/examples/runners/cpu/Cargo.toml b/examples/runners/cpu/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "example-runner-cpu"
-version = "0.4.0-alpha.10"
+version = "0.4.0-alpha.11"
 authors = ["Embark <[email protected]>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

diff --git a/examples/runners/wgpu/Cargo.toml b/examples/runners/wgpu/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "example-runner-wgpu"
-version = "0.4.0-alpha.10"
+version = "0.4.0-alpha.11"
 authors = ["Embark <[email protected]>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

diff --git a/examples/runners/wgpu/builder/Cargo.toml b/examples/runners/wgpu/builder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "example-runner-wgpu-builder"
-version = "0.4.0-alpha.10"
+version = "0.4.0-alpha.11"
 authors = ["Embark <[email protected]>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

diff --git a/examples/shaders/compute-shader/Cargo.toml b/examples/shaders/compute-shader/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "compute-shader"
-version = "0.4.0-alpha.10"
+version = "0.4.0-alpha.11"
 authors = ["Embark <[email protected]>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

diff --git a/examples/shaders/mouse-shader/Cargo.toml b/examples/shaders/mouse-shader/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mouse-shader"
-version = "0.4.0-alpha.10"
+version = "0.4.0-alpha.11"
 authors = ["Embark <[email protected]>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

diff --git a/examples/shaders/shared/Cargo.toml b/examples/shaders/shared/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "shared"
-version = "0.4.0-alpha.10"
+version = "0.4.0-alpha.11"
 authors = ["Embark <[email protected]>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

diff --git a/examples/shaders/simplest-shader/Cargo.toml b/examples/shaders/simplest-shader/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "simplest-shader"
-version = "0.4.0-alpha.10"
+version = "0.4.0-alpha.11"
 authors = ["Embark <[email protected]>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

diff --git a/examples/shaders/sky-shader/Cargo.toml b/examples/shaders/sky-shader/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sky-shader"
-version = "0.4.0-alpha.10"
+version = "0.4.0-alpha.11"
 authors = ["Embark <[email protected]>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "compiletests"
-version = "0.4.0-alpha.10"
+version = "0.4.0-alpha.11"
 authors = ["Embark <[email protected]>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

diff --git a/tests/deps-helper/Cargo.toml b/tests/deps-helper/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "compiletests-deps-helper"
-version = "0.4.0-alpha.10"
+version = "0.4.0-alpha.11"
 description = "Shared dependencies of all the compiletest tests"
 authors = ["Embark <[email protected]>"]
 edition = "2018"

diff --git a/tests/ui/image/sample.rs b/tests/ui/image/sample.rs
@@ -13,7 +13,8 @@ pub fn main(
 ) {
     let v2 = glam::Vec2::new(0.0, 1.0);
     let v3 = glam::Vec3::new(0.0, 1.0, 0.5);
-    *output = image2d.sample(*sampler, v2);
-    *output += image2d_array.sample(*sampler, v3);
-    *output += cubemap.sample(*sampler, v3);
+    let r1: glam::Vec4 = image2d.sample(*sampler, v2);
+    let r2: glam::Vec4 = image2d_array.sample(*sampler, v3);
+    let r3: glam::Vec4 = cubemap.sample(*sampler, v3);
+    *output = r1 + r2 + r3;
 }
diff --git a/tests/ui/image/sample_gradient.rs b/tests/ui/image/sample_gradient.rs
@@ -13,7 +13,8 @@ pub fn main(
 ) {
     let v2 = glam::Vec2::new(0.0, 1.0);
     let v3 = glam::Vec3::new(0.0, 1.0, 0.5);
-    *output = image2d.sample_by_gradient(*sampler, v2, v2, v2);
-    *output += image2d_array.sample_by_gradient(*sampler, v3, v2, v2);
-    *output += cubemap.sample_by_gradient(*sampler, v3, v3, v3);
+    let r1: glam::Vec4 = image2d.sample_by_gradient(*sampler, v2, v2, v2);
+    let r2: glam::Vec4 = image2d_array.sample_by_gradient(*sampler, v3, v2, v2);
+    let r3: glam::Vec4 = cubemap.sample_by_gradient(*sampler, v3, v3, v3);
+    *output = r1 + r2 + r3;
 }
diff --git a/tests/ui/image/sample_lod.rs b/tests/ui/image/sample_lod.rs
@@ -13,7 +13,8 @@ pub fn main(
 ) {
     let v2 = glam::Vec2::new(0.0, 1.0);
     let v3 = glam::Vec3::new(0.0, 1.0, 0.5);
-    *output = image2d.sample_by_lod(*sampler, v2, 0.0);
-    *output += image2d_array.sample_by_lod(*sampler, v3, 0.0);
-    *output += cubemap.sample_by_lod(*sampler, v3, 0.0);
+    let r1: glam::Vec4 = image2d.sample_by_lod(*sampler, v2, 0.0);
+    let r2: glam::Vec4 = image2d_array.sample_by_lod(*sampler, v3, 0.0);
+    let r3: glam::Vec4 = cubemap.sample_by_lod(*sampler, v3, 0.0);
+    *output = r1 + r2 + r3;
 }