move mod: move arch::derivative and arch::demote_to_helper_invocation to fragment

Author: Firestar99

crates/spirv-std/src/arch.rs

@@ -12,13 +12,9 @@ use glam::UVec2;
 
 mod atomics;
 mod barrier;
-mod demote_to_helper_invocation_ext;
-mod derivative;
 
 pub use atomics::*;
 pub use barrier::*;
-pub use demote_to_helper_invocation_ext::*;
-pub use derivative::*;
 
 /// Result is true if any component of `vector` is true, otherwise result is
 /// false.
@@ -124,18 +120,6 @@ pub unsafe fn vector_insert_dynamic<T: Scalar, V: Vector<T, N>, const N: usize>(
     }
 }
 
-/// Fragment-shader discard. Equivalvent to `discard()` from GLSL
-///
-/// Ceases all further processing in any invocation that executes it: Only
-/// instructions these invocations executed before [kill] have observable side
-/// effects.
-#[spirv_std_macros::gpu_only]
-#[doc(alias = "OpKill", alias = "discard")]
-#[allow(clippy::empty_loop)]
-pub fn kill() -> ! {
-    unsafe { asm!("OpKill", options(noreturn)) }
-}
-
 /// Read from the shader clock with either the `Subgroup` or `Device` scope.
 ///
 /// See:

…/arch/demote_to_helper_invocation_ext.rs …/fragment/demote_to_helper_invocation.rscrates/spirv-std/src/arch/demote_to_helper_invocation_ext.rs renamed to crates/spirv-std/src/fragment/demote_to_helper_invocation.rs crates/spirv-std/src/arch/demote_to_helper_invocation_ext.rs renamed to crates/spirv-std/src/fragment/demote_to_helper_invocation.rs

@@ -0,0 +1,22 @@
+//! Intrinsics for fragment shaders
+
+#[cfg(target_arch = "spirv")]
+use core::arch::asm;
+
+mod demote_to_helper_invocation;
+mod derivative;
+
+pub use demote_to_helper_invocation::*;
+pub use derivative::*;
+
+/// Fragment-shader discard. Equivalent to `discard()` from GLSL
+///
+/// Ceases all further processing in any invocation that executes it: Only
+/// instructions these invocations executed before [kill] have observable side
+/// effects.
+#[spirv_std_macros::gpu_only]
+#[doc(alias = "OpKill", alias = "discard")]
+#[allow(clippy::empty_loop)]
+pub fn kill() -> ! {
+    unsafe { asm!("OpKill", options(noreturn)) }
+}

crates/spirv-std/src/arch/derivative.rs …tes/spirv-std/src/fragment/derivative.rscrates/spirv-std/src/arch/derivative.rs renamed to crates/spirv-std/src/fragment/derivative.rs crates/spirv-std/src/arch/derivative.rs renamed to crates/spirv-std/src/fragment/derivative.rs

@@ -95,6 +95,7 @@ pub mod arch;
 pub mod byte_addressable_buffer;
 pub mod debug_printf;
 pub mod float;
+pub mod fragment;
 pub mod geometry;
 pub mod image;
 pub mod indirect_command;

crates/spirv-std/src/fragment/mod.rs

@@ -6,6 +6,6 @@ use spirv_std::spirv;
 
 #[spirv(fragment)]
 pub fn main() {
-    unsafe { spirv_std::arch::demote_to_helper_invocation() };
-    assert!(spirv_std::arch::is_helper_invocation());
+    unsafe { spirv_std::fragment::demote_to_helper_invocation() };
+    assert!(spirv_std::fragment::is_helper_invocation());
 }

crates/spirv-std/src/lib.rs

@@ -1,7 +1,7 @@
 // build-pass
 // compile-flags: -C llvm-args=--disassemble-fn=derivative::derivative
 
-use spirv_std::arch::Derivative;
+use spirv_std::fragment::Derivative;
 use spirv_std::spirv;
 
 #[spirv(fragment)]

…s/ui/arch/demote_to_helper_invocation.rs …/fragment/demote_to_helper_invocation.rstests/compiletests/ui/arch/demote_to_helper_invocation.rs renamed to tests/compiletests/ui/entry/fragment/demote_to_helper_invocation.rs tests/compiletests/ui/arch/demote_to_helper_invocation.rs renamed to tests/compiletests/ui/entry/fragment/demote_to_helper_invocation.rs

@@ -2,7 +2,7 @@
 // compile-flags: -C target-feature=+DerivativeControl
 // compile-flags: -C llvm-args=--disassemble-fn=derivative_control::derivative
 
-use spirv_std::arch::Derivative;
+use spirv_std::fragment::Derivative;
 use spirv_std::spirv;
 
 #[spirv(fragment)]