derivative: do not implicitly turn on OpCapability DerivativeControl, fix warnings

Author: Firestar99

crates/spirv-std/src/arch/derivative.rs

@@ -1,14 +1,7 @@
 use crate::sealed::Sealed;
 use glam::{Vec2, Vec3, Vec3A, Vec4};
 
-macro_rules! cap_deriv_control {
-    () => {
-        unsafe {
-            core::arch::asm!("OpCapability DerivativeControl");
-        }
-    };
-}
-
+#[cfg(target_arch = "spirv")]
 macro_rules! deriv_fn {
     ($inst:ident, $param:expr) => {
         unsafe {
@@ -51,7 +44,6 @@ pub unsafe trait Derivative: Sealed + Default {
     #[crate::macros::gpu_only]
     #[inline]
     fn ddx_fine(self) -> Self {
-        cap_deriv_control!();
         deriv_fn!(OpDPdxFine, self)
     }
 
@@ -67,7 +59,6 @@ pub unsafe trait Derivative: Sealed + Default {
     #[crate::macros::gpu_only]
     #[inline]
     fn ddx_coarse(self) -> Self {
-        cap_deriv_control!();
         deriv_fn!(OpDPdxCoarse, self)
     }
 
@@ -95,7 +86,6 @@ pub unsafe trait Derivative: Sealed + Default {
     #[crate::macros::gpu_only]
     #[inline]
     fn ddy_fine(self) -> Self {
-        cap_deriv_control!();
         deriv_fn!(OpDPdyFine, self)
     }
 
@@ -111,7 +101,6 @@ pub unsafe trait Derivative: Sealed + Default {
     #[crate::macros::gpu_only]
     #[inline]
     fn ddy_coarse(self) -> Self {
-        cap_deriv_control!();
         deriv_fn!(OpDPdyCoarse, self)
     }
 
@@ -136,7 +125,6 @@ pub unsafe trait Derivative: Sealed + Default {
     #[crate::macros::gpu_only]
     #[inline]
     fn fwidth_fine(self) -> Self {
-        cap_deriv_control!();
         deriv_fn!(OpFwidthFine, self)
     }
 
@@ -149,7 +137,6 @@ pub unsafe trait Derivative: Sealed + Default {
     #[crate::macros::gpu_only]
     #[inline]
     fn fwidth_coarse(self) -> Self {
-        cap_deriv_control!();
         deriv_fn!(OpFwidthCoarse, self)
     }
 }

tests/ui/arch/derivative.stderr

@@ -1,10 +1,10 @@
 %1 = OpFunction  %2  None %3
 %4 = OpLabel
-OpLine %5 41 8
+OpLine %5 34 8
 %6 = OpDPdx  %7  %8
-OpLine %5 85 8
+OpLine %5 76 8
 %9 = OpDPdy  %7  %8
-OpLine %5 127 8
+OpLine %5 116 8
 %10 = OpFwidth  %7  %8
 OpNoLine
 OpReturn

tests/ui/arch/derivative_control.stderr

@@ -1,16 +1,16 @@
 %1 = OpFunction  %2  None %3
 %4 = OpLabel
-OpLine %5 55 8
+OpLine %5 47 8
 %6 = OpDPdxFine  %7  %8
-OpLine %5 99 8
+OpLine %5 89 8
 %9 = OpDPdyFine  %7  %8
-OpLine %5 140 8
+OpLine %5 128 8
 %10 = OpFwidthFine  %7  %8
-OpLine %5 71 8
+OpLine %5 62 8
 %11 = OpDPdxCoarse  %7  %8
-OpLine %5 115 8
+OpLine %5 104 8
 %12 = OpDPdyCoarse  %7  %8
-OpLine %5 153 8
+OpLine %5 140 8
 %13 = OpFwidthCoarse  %7  %8
 OpNoLine
 OpReturn