nordic-dev.net/rust-gpu
2
0
Fork 0
mirror of https://github.com/EmbarkStudios/rust-gpu.git synced 2024-11-22 06:45:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to nightly-2022-12-18

Browse Source 
This nightly includes a clippy fix that we need (https://github.com/rust-lang/rust-clippy/pull/10055)
This commit is contained in:
Sylvester Hesp 2023-01-05 12:35:01 +01:00 committed by Eduard-Mihai Burtescu
parent 87dc07c623
commit 86d6042204
9 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/rustc_codegen_spirv/build.rs
View File

@ -10,9 +10,9 @@ use std::process::{Command, ExitCode};
/// `cargo publish`. We need to figure out a way to do this properly, but let's hardcode it for now :/ /// `cargo publish`. We need to figure out a way to do this properly, but let's hardcode it for now :/
//const REQUIRED_RUST_TOOLCHAIN: &str = include_str!("../../rust-toolchain"); //const REQUIRED_RUST_TOOLCHAIN: &str = include_str!("../../rust-toolchain");
const REQUIRED_RUST_TOOLCHAIN: &str = r#"[toolchain] const REQUIRED_RUST_TOOLCHAIN: &str = r#"[toolchain]
channel = "nightly-2022-12-10" channel = "nightly-2022-12-18"
components = ["rust-src", "rustc-dev", "llvm-tools-preview"] components = ["rust-src", "rustc-dev", "llvm-tools-preview"]
# commit_hash = dfe3fe710181738a2cb3060c23ec5efb3c68ca09"#; # commit_hash = 0468a00ae3fd6ef1a6a0f9eaf637d7aa9e604acc"#;
fn get_rustc_commit_hash() -> Result<String, Box<dyn Error>> { fn get_rustc_commit_hash() -> Result<String, Box<dyn Error>> {
let rustc = std::env::var("RUSTC").unwrap_or_else(|_| String::from("rustc")); let rustc = std::env::var("RUSTC").unwrap_or_else(|_| String::from("rustc"));

4
crates/rustc_codegen_spirv/src/builder/builder_methods.rs
View File

@ -2065,11 +2065,11 @@ impl<'a, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'tcx> {
} }
// These are used by everyone except msvc // These are used by everyone except msvc
fn cleanup_landing_pad(&mut self, _ty: Self::Type, _pers_fn: Self::Value) -> Self::Value { fn cleanup_landing_pad(&mut self, _pers_fn: Self::Value) -> (Self::Value, Self::Value) {
todo!() todo!()
} }
fn resume(&mut self, _exn: Self::Value) { fn resume(&mut self, _exn0: Self::Value, _exn1: Self::Value) {
todo!() todo!()
} }

4
crates/rustc_codegen_spirv/src/builder/mod.rs
View File

@ -447,4 +447,8 @@ impl<'tcx> TypeMembershipMethods<'tcx> for CodegenCx<'tcx> {
fn typeid_metadata(&self, _typeid: String) -> Self::Value { fn typeid_metadata(&self, _typeid: String) -> Self::Value {
todo!() todo!()
} }
fn set_kcfi_type_metadata(&self, _function: Self::Function, _typeid: u32) {
// ignore
}
} }

4
rust-toolchain
View File

@ -5,9 +5,9 @@
# to the user in the error, instead of "error: invalid channel name '[toolchain]'". # to the user in the error, instead of "error: invalid channel name '[toolchain]'".
[toolchain] [toolchain]
channel = "nightly-2022-12-10" channel = "nightly-2022-12-18"
components = ["rust-src", "rustc-dev", "llvm-tools-preview"] components = ["rust-src", "rustc-dev", "llvm-tools-preview"]
# commit_hash = dfe3fe710181738a2cb3060c23ec5efb3c68ca09 # commit_hash = 0468a00ae3fd6ef1a6a0f9eaf637d7aa9e604acc
# Whenever changing the nightly channel, update the commit hash above, and make # Whenever changing the nightly channel, update the commit hash above, and make
# sure to change REQUIRED_TOOLCHAIN in crates/rustc_codegen_spirv/src/build.rs also. # sure to change REQUIRED_TOOLCHAIN in crates/rustc_codegen_spirv/src/build.rs also.

12
tests/ui/image/gather_err.stderr
View File

@ -1,10 +1,8 @@
error[E0277]: the trait bound `Image<f32, 0, 2, 0, 0, 1, 0>: HasGather` is not satisfied error[E0277]: the trait bound `Image<f32, 0, 2, 0, 0, 1, 0>: HasGather` is not satisfied
--> $DIR/gather_err.rs:15:26 --> $DIR/gather_err.rs:15:34
| |
15 | let r1: glam::Vec4 = image1d.gather(*sampler, 0.0f32, 0); 15 | let r1: glam::Vec4 = image1d.gather(*sampler, 0.0f32, 0);
| ^^^^^^^ ------ required by a bound introduced by this call | ^^^^^^ the trait `HasGather` is not implemented for `Image<f32, 0, 2, 0, 0, 1, 0>`
| |
| the trait `HasGather` is not implemented for `Image<f32, 0, 2, 0, 0, 1, 0>`
| |
= help: the following other types implement trait `HasGather`: = help: the following other types implement trait `HasGather`:
Image<SampledType, 1, DEPTH, ARRAYED, 0, SAMPLED, FORMAT> Image<SampledType, 1, DEPTH, ARRAYED, 0, SAMPLED, FORMAT>
@ -17,12 +15,10 @@ note: required by a bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, _, SAMPL
| ^^^^^^^^^ required by this bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, _, SAMPLED, FORMAT>::gather` | ^^^^^^^^^ required by this bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, _, SAMPLED, FORMAT>::gather`
error[E0277]: the trait bound `Image<f32, 2, 2, 0, 0, 1, 0>: HasGather` is not satisfied error[E0277]: the trait bound `Image<f32, 2, 2, 0, 0, 1, 0>: HasGather` is not satisfied
--> $DIR/gather_err.rs:16:26 --> $DIR/gather_err.rs:16:34
| |
16 | let r2: glam::Vec4 = image3d.gather(*sampler, v3, 0); 16 | let r2: glam::Vec4 = image3d.gather(*sampler, v3, 0);
| ^^^^^^^ ------ required by a bound introduced by this call | ^^^^^^ the trait `HasGather` is not implemented for `Image<f32, 2, 2, 0, 0, 1, 0>`
| |
| the trait `HasGather` is not implemented for `Image<f32, 2, 2, 0, 0, 1, 0>`
| |
= help: the following other types implement trait `HasGather`: = help: the following other types implement trait `HasGather`:
Image<SampledType, 1, DEPTH, ARRAYED, 0, SAMPLED, FORMAT> Image<SampledType, 1, DEPTH, ARRAYED, 0, SAMPLED, FORMAT>

6
tests/ui/image/query/query_levels_err.stderr
View File

@ -1,10 +1,8 @@
error[E0277]: the trait bound `Image<f32, 4, 2, 0, 0, 1, 0>: HasQueryLevels` is not satisfied error[E0277]: the trait bound `Image<f32, 4, 2, 0, 0, 1, 0>: HasQueryLevels` is not satisfied
--> $DIR/query_levels_err.rs:12:15 --> $DIR/query_levels_err.rs:12:21
| |
12 | *output = image.query_levels(); 12 | *output = image.query_levels();
| ^^^^^ ------------ required by a bound introduced by this call | ^^^^^^^^^^^^ the trait `HasQueryLevels` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0>`
| |
| the trait `HasQueryLevels` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0>`
| |
= help: the following other types implement trait `HasQueryLevels`: = help: the following other types implement trait `HasQueryLevels`:
Image<SampledType, 0, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT> Image<SampledType, 0, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT>

6
tests/ui/image/query/query_lod_err.stderr
View File

@ -1,10 +1,8 @@
error[E0277]: the trait bound `Image<f32, 4, 2, 0, 0, 1, 0>: HasQueryLevels` is not satisfied error[E0277]: the trait bound `Image<f32, 4, 2, 0, 0, 1, 0>: HasQueryLevels` is not satisfied
--> $DIR/query_lod_err.rs:13:15 --> $DIR/query_lod_err.rs:13:21
| |
13 | *output = image.query_lod(*sampler, glam::Vec2::new(0.0, 1.0)); 13 | *output = image.query_lod(*sampler, glam::Vec2::new(0.0, 1.0));
| ^^^^^ --------- required by a bound introduced by this call | ^^^^^^^^^ the trait `HasQueryLevels` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0>`
| |
| the trait `HasQueryLevels` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0>`
| |
= help: the following other types implement trait `HasQueryLevels`: = help: the following other types implement trait `HasQueryLevels`:
Image<SampledType, 0, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT> Image<SampledType, 0, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT>

6
tests/ui/image/query/query_size_err.stderr
View File

@ -1,10 +1,8 @@
error[E0277]: the trait bound `Image<f32, 1, 2, 0, 0, 1, 0>: HasQuerySize` is not satisfied error[E0277]: the trait bound `Image<f32, 1, 2, 0, 0, 1, 0>: HasQuerySize` is not satisfied
--> $DIR/query_size_err.rs:12:15 --> $DIR/query_size_err.rs:12:21
| |
12 | *output = image.query_size(); 12 | *output = image.query_size();
| ^^^^^ ---------- required by a bound introduced by this call | ^^^^^^^^^^ the trait `HasQuerySize` is not implemented for `Image<f32, 1, 2, 0, 0, 1, 0>`
| |
| the trait `HasQuerySize` is not implemented for `Image<f32, 1, 2, 0, 0, 1, 0>`
| |
= help: the following other types implement trait `HasQuerySize`: = help: the following other types implement trait `HasQuerySize`:
Image<SampledType, 0, DEPTH, ARRAYED, 0, 0, FORMAT> Image<SampledType, 0, DEPTH, ARRAYED, 0, 0, FORMAT>

6
tests/ui/image/query/query_size_lod_err.stderr
View File

@ -1,10 +1,8 @@
error[E0277]: the trait bound `Image<f32, 4, 2, 0, 0, 1, 0>: HasQuerySizeLod` is not satisfied error[E0277]: the trait bound `Image<f32, 4, 2, 0, 0, 1, 0>: HasQuerySizeLod` is not satisfied
--> $DIR/query_size_lod_err.rs:12:15 --> $DIR/query_size_lod_err.rs:12:21
| |
12 | *output = image.query_size_lod(0); 12 | *output = image.query_size_lod(0);
| ^^^^^ -------------- required by a bound introduced by this call | ^^^^^^^^^^^^^^ the trait `HasQuerySizeLod` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0>`
| |
| the trait `HasQuerySizeLod` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0>`
| |
= help: the following other types implement trait `HasQuerySizeLod`: = help: the following other types implement trait `HasQuerySizeLod`:
Image<SampledType, 0, DEPTH, ARRAYED, 0, SAMPLED, FORMAT> Image<SampledType, 0, DEPTH, ARRAYED, 0, SAMPLED, FORMAT>