Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to 0.4.0-alpha.17 and version fixes #937

Merged
merged 1 commit into from
Nov 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.4.0-alpha.17]

### Changed 🛠️

- Fixed rust-gpu crates not referring to each-other by exact version
- Fixed `spirv-std` referring to an older version of `spirv-std-macros`

## [0.4.0-alpha.16]

### Added ⭐
Expand Down
12 changes: 6 additions & 6 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion crates/rustc_codegen_spirv-types/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "rustc_codegen_spirv-types"
description = "SPIR-V backend types shared between rustc_codegen_spirv and spirv-builder"
version = "0.4.0-alpha.16"
version = "0.4.0-alpha.17"
authors = ["Embark <[email protected]>"]
edition = "2018"
license = "MIT OR Apache-2.0"
Expand Down
4 changes: 2 additions & 2 deletions crates/rustc_codegen_spirv/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rustc_codegen_spirv"
version = "0.4.0-alpha.16"
version = "0.4.0-alpha.17"
authors = ["Embark <[email protected]>"]
edition = "2018"
license = "MIT OR Apache-2.0"
Expand Down Expand Up @@ -59,7 +59,7 @@ serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
smallvec = { version = "1.6.1", features = ["union"] }
spirv-tools = { version = "0.9", default-features = false }
rustc_codegen_spirv-types = { path = "../rustc_codegen_spirv-types", version = "0.4.0-alpha.16" }
rustc_codegen_spirv-types = { path = "../rustc_codegen_spirv-types", version = "=0.4.0-alpha.17" }

[dev-dependencies]
pipe = "0.4"
Expand Down
6 changes: 3 additions & 3 deletions crates/spirv-builder/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "spirv-builder"
version = "0.4.0-alpha.16"
version = "0.4.0-alpha.17"
authors = ["Embark <[email protected]>"]
edition = "2018"
license = "MIT OR Apache-2.0"
Expand All @@ -20,8 +20,8 @@ memchr = "2.4"
raw-string = "0.3.5"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
rustc_codegen_spirv-types = { path = "../rustc_codegen_spirv-types", version = "0.4.0-alpha.16" }
rustc_codegen_spirv-types = { path = "../rustc_codegen_spirv-types", version = "=0.4.0-alpha.17" }
# See comment in lib.rs invoke_rustc for why this is here
rustc_codegen_spirv = { path = "../rustc_codegen_spirv", version = "0.4.0-alpha.16", default-features = false }
rustc_codegen_spirv = { path = "../rustc_codegen_spirv", version = "=0.4.0-alpha.17", default-features = false }

notify = { version = "5.0.0-pre.11", optional = true }
6 changes: 3 additions & 3 deletions crates/spirv-std/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "spirv-std"
version = "0.4.0-alpha.16"
version = "0.4.0-alpha.17"
authors = ["Embark <[email protected]>"]
edition = "2018"
license = "MIT OR Apache-2.0"
Expand All @@ -10,8 +10,8 @@ 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-std-types = { path = "./shared", version = "0.4.0-alpha.16" }
spirv-std-macros = { path = "./macros", version = "0.4.0-alpha.13" }
spirv-std-types = { path = "./shared", version = "=0.4.0-alpha.17" }
spirv-std-macros = { path = "./macros", version = "=0.4.0-alpha.17" }
glam = { version = "0.22", default-features = false, features = ["libm"], optional = true }

[features]
Expand Down
4 changes: 2 additions & 2 deletions crates/spirv-std/macros/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "spirv-std-macros"
version = "0.4.0-alpha.16"
version = "0.4.0-alpha.17"
authors = ["Embark <[email protected]>"]
edition = "2018"
license = "MIT OR Apache-2.0"
Expand All @@ -11,7 +11,7 @@ description = "Macros for spirv-std"
proc-macro = true

[dependencies]
spirv-std-types = { path = "../shared", version = "0.4.0-alpha.16" }
spirv-std-types = { path = "../shared", version = "=0.4.0-alpha.17" }
proc-macro2 = "1.0.24"
quote = "1.0.8"
syn = { version = "1.0.58", features=["full"] }
2 changes: 1 addition & 1 deletion crates/spirv-std/shared/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "spirv-std-types"
description = "SPIR-V types shared between spirv-std and spirv-std-macros"
version = "0.4.0-alpha.16"
version = "0.4.0-alpha.17"
authors = ["Embark <[email protected]>"]
edition = "2018"
license = "MIT OR Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ use-compiled-tools = ["rustc_codegen_spirv/use-compiled-tools"]

[dependencies]
compiletest = { version = "0.7.0", package = "compiletest_rs" }
rustc_codegen_spirv = { path = "../crates/rustc_codegen_spirv", version = "0.4.0-alpha.16", default-features = false }
rustc_codegen_spirv = { path = "../crates/rustc_codegen_spirv", version = "=0.4.0-alpha.17", default-features = false }
structopt = "0.3.21"