tests: fix a couple mistakes that spirv-val now catches.

EmbarkStudios · Oct 28, 2022 · fbc20c2 · fbc20c2
1 parent 8efc422
commit fbc20c2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/tests/ui/arch/execute_callable.rs b/tests/ui/arch/execute_callable.rs
@@ -9,7 +9,7 @@ use spirv_std::spirv;
 pub fn main(
     #[spirv(descriptor_set = 0, binding = 0)]
     acceleration_structure: &spirv_std::ray_tracing::AccelerationStructure,
-    #[spirv(incoming_callable_data)] payload: &glam::Vec3,
+    #[spirv(callable_data)] payload: &glam::Vec3,
 ) {
     unsafe {
         spirv_std::arch::execute_callable::<_, 5>(payload);

diff --git a/tests/ui/spirv-attr/all-builtins.rs b/tests/ui/spirv-attr/all-builtins.rs
@@ -42,15 +42,6 @@ pub fn compute(
 #[spirv(vertex)]
 pub fn vertex(
     #[spirv(SMIDNV)] smidnv: u32,
-    #[spirv(bary_coord_no_persp_amd)] bary_coord_no_persp_amd: u32,
-    #[spirv(bary_coord_no_persp_centroid_amd)] bary_coord_no_persp_centroid_amd: u32,
-    #[spirv(bary_coord_no_persp_nv)] bary_coord_no_persp_nv: u32,
-    #[spirv(bary_coord_no_persp_sample_amd)] bary_coord_no_persp_sample_amd: u32,
-    #[spirv(bary_coord_nv)] bary_coord_nv: u32,
-    #[spirv(bary_coord_pull_model_amd)] bary_coord_pull_model_amd: u32,
-    #[spirv(bary_coord_smooth_amd)] bary_coord_smooth_amd: u32,
-    #[spirv(bary_coord_smooth_centroid_amd)] bary_coord_smooth_centroid_amd: u32,
-    #[spirv(bary_coord_smooth_sample_amd)] bary_coord_smooth_sample_amd: u32,
     #[spirv(base_instance)] base_instance: u32,
     #[spirv(base_vertex)] base_vertex: u32,
     #[spirv(clip_distance_per_view_nv)] clip_distance_per_view_nv: u32,
@@ -91,6 +82,15 @@ pub fn vertex(
 
 #[spirv(fragment)]
 pub fn fragment(
+    #[spirv(bary_coord_no_persp_amd)] bary_coord_no_persp_amd: Vec3,
+    #[spirv(bary_coord_no_persp_centroid_amd)] bary_coord_no_persp_centroid_amd: Vec3,
+    #[spirv(bary_coord_no_persp_nv)] bary_coord_no_persp_nv: Vec3,
+    #[spirv(bary_coord_no_persp_sample_amd)] bary_coord_no_persp_sample_amd: Vec3,
+    #[spirv(bary_coord_nv)] bary_coord_nv: Vec3,
+    #[spirv(bary_coord_pull_model_amd)] bary_coord_pull_model_amd: Vec3,
+    #[spirv(bary_coord_smooth_amd)] bary_coord_smooth_amd: Vec3,
+    #[spirv(bary_coord_smooth_centroid_amd)] bary_coord_smooth_centroid_amd: Vec3,
+    #[spirv(bary_coord_smooth_sample_amd)] bary_coord_smooth_sample_amd: Vec3,
     #[spirv(clip_distance)] clip_distance: [f32; 1],
     #[spirv(cull_distance)] cull_distance: [f32; 1],
     #[spirv(frag_coord)] frag_coord: Vec4,