location assignment: bless other compiletests

Author: Firestar99

tests/compiletests/ui/lang/core/ptr/allocate_const_scalar.stderr

@@ -7,18 +7,11 @@ LL | #![feature(ptr_internals)]
    = note: using it is strongly discouraged
    = note: `#[warn(internal_features)]` on by default
 
-error: pointer has non-null integer address
-   |
-note: used from within `allocate_const_scalar::main`
-  --> $DIR/allocate_const_scalar.rs:16:5
-   |
-LL |     *output = POINTER;
-   |     ^^^^^^^^^^^^^^^^^
-note: called by `main`
-  --> $DIR/allocate_const_scalar.rs:15:8
+error: Type not supported in Input or Output declarations
+  --> $DIR/allocate_const_scalar.rs:15:21
    |
 LL | pub fn main(output: &mut Unique<()>) {
-   |        ^^^^
+   |                     ^^^^^^^^^^^^^^^
 
 error: aborting due to 1 previous error; 1 warning emitted
 

tests/compiletests/ui/spirv-attr/bad-deduce-storage-class.rs

@@ -5,11 +5,11 @@ use spirv_std::{Image, spirv};
 
 #[spirv(vertex)]
 pub fn main(
-    #[spirv(uniform)] error: &Image!(2D, type=f32),
-    #[spirv(uniform_constant)] warning: &Image!(2D, type=f32),
+    #[spirv(descriptor_set = 0, binding = 0, uniform)] error: &Image!(2D, type=f32),
+    #[spirv(descriptor_set = 0, binding = 1, uniform_constant)] warning: &Image!(2D, type=f32),
 ) {
 }
 
 // https://github.com/EmbarkStudios/rust-gpu/issues/585
 #[spirv(vertex)]
-pub fn issue_585(invalid: Image!(2D, type=f32)) {}
+pub fn issue_585(#[spirv(descriptor_set = 0, binding = 0)] invalid: Image!(2D, type=f32)) {}

tests/compiletests/ui/spirv-attr/bad-deduce-storage-class.stderr

@@ -1,25 +1,25 @@
 error: storage class mismatch
   --> $DIR/bad-deduce-storage-class.rs:8:5
    |
-LL |     #[spirv(uniform)] error: &Image!(2D, type=f32),
-   |     ^^^^^^^^-------^^^^^^^^^^---------------------
-   |             |                |
-   |             |                `UniformConstant` deduced from type
-   |             `Uniform` specified in attribute
+LL |     #[spirv(descriptor_set = 0, binding = 0, uniform)] error: &Image!(2D, type=f32),
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-------^^^^^^^^^^---------------------
+   |                                              |                |
+   |                                              |                `UniformConstant` deduced from type
+   |                                              `Uniform` specified in attribute
    |
    = help: remove storage class attribute to use `UniformConstant` as storage class
 
 warning: redundant storage class attribute, storage class is deduced from type
-  --> $DIR/bad-deduce-storage-class.rs:9:13
+  --> $DIR/bad-deduce-storage-class.rs:9:46
    |
-LL |     #[spirv(uniform_constant)] warning: &Image!(2D, type=f32),
-   |             ^^^^^^^^^^^^^^^^
+LL |     #[spirv(descriptor_set = 0, binding = 1, uniform_constant)] warning: &Image!(2D, type=f32),
+   |                                              ^^^^^^^^^^^^^^^^
 
 error: entry parameter type must be by-reference: `&spirv_std::image::Image<f32, 1, 2, 0, 0, 0, 0, 4>`
-  --> $DIR/bad-deduce-storage-class.rs:15:27
+  --> $DIR/bad-deduce-storage-class.rs:15:69
    |
-LL | pub fn issue_585(invalid: Image!(2D, type=f32)) {}
-   |                           ^^^^^^^^^^^^^^^^^^^^
+LL | pub fn issue_585(#[spirv(descriptor_set = 0, binding = 0)] invalid: Image!(2D, type=f32)) {}
+   |                                                                     ^^^^^^^^^^^^^^^^^^^^
    |
    = note: this error originates in the macro `Image` (in Nightly builds, run with -Z macro-backtrace for more info)
 

tests/compiletests/ui/spirv-attr/bool-inputs-err.stderr

@@ -4,12 +4,24 @@ error: entry-point parameter cannot contain `bool`s
 LL |     input: bool,
    |            ^^^^
 
+error: Type not supported in Input or Output declarations
+  --> $DIR/bool-inputs-err.rs:13:12
+   |
+LL |     input: bool,
+   |            ^^^^
+
 error: entry-point parameter cannot contain `bool`s
   --> $DIR/bool-inputs-err.rs:14:13
    |
 LL |     output: &mut bool,
    |             ^^^^^^^^^
 
+error: Type not supported in Input or Output declarations
+  --> $DIR/bool-inputs-err.rs:14:13
+   |
+LL |     output: &mut bool,
+   |             ^^^^^^^^^
+
 error: entry-point parameter cannot contain `bool`s
   --> $DIR/bool-inputs-err.rs:15:35
    |
@@ -22,5 +34,5 @@ error: entry-point parameter cannot contain `bool`s
 LL |     #[spirv(uniform)] uniform: &Boolthing,
    |                                ^^^^^^^^^^
 
-error: aborting due to 4 previous errors
+error: aborting due to 6 previous errors
 

tests/compiletests/ui/spirv-attr/uniform-constant-storage-class.rs

@@ -0,0 +1,11 @@
+// build-pass
+
+use spirv_std::image::Image2d;
+use spirv_std::spirv;
+
+#[spirv(vertex)]
+pub fn main(
+    #[spirv(descriptor_set = 0, binding = 0)] implicit: &Image2d,
+    #[spirv(descriptor_set = 0, binding = 1, uniform_constant)] explicit: &Image2d,
+) {
+}

tests/compiletests/ui/spirv-attr/uniform-constant-storage-class.stderr

@@ -0,0 +1,8 @@
+warning: redundant storage class attribute, storage class is deduced from type
+  --> $DIR/uniform-constant-storage-class.rs:9:46
+   |
+LL |     #[spirv(descriptor_set = 0, binding = 1, uniform_constant)] explicit: &Image2d,
+   |                                              ^^^^^^^^^^^^^^^^
+
+warning: 1 warning emitted
+