grab spirv-builder from difftest to pick up features

Author: Firestar99

tests/difftests/lib/src/lib.rs

@@ -5,6 +5,9 @@ pub mod config;
 #[cfg(not(target_arch = "spirv"))]
 pub mod scaffold;
 
+#[cfg(not(target_arch = "spirv"))]
+pub use spirv_builder;
+
 /// Macro to round a f32 value for cross-platform compatibility in floating-point
 /// operations. This helps ensure difftest results are consistent across different
 /// platforms (Linux, Mac, Windows) which may have slight differences in floating-point

tests/difftests/tests/Cargo.lock

@@ -45,7 +45,6 @@ unexpected_cfgs = { level = "allow", check-cfg = [
 ] }
 
 [workspace.dependencies]
-spirv-builder = { path = "../../../crates/spirv-builder", version = "=0.9.0", default-features = false }
 spirv-std = { path = "../../../crates/spirv-std", version = "=0.9.0" }
 spirv-std-types = { path = "../../../crates/spirv-std/shared", version = "=0.9.0" }
 spirv-std-macros = { path = "../../../crates/spirv-std/macros", version = "=0.9.0" }

tests/difftests/tests/Cargo.toml

@@ -17,6 +17,5 @@ spirv-std.workspace = true
 
 # CPU deps
 [target.'cfg(not(target_arch = "spirv"))'.dependencies]
-spirv-builder.workspace = true
 difftest.workspace = true
 bytemuck.workspace = true

tests/difftests/tests/arch/workgroup_memory/workgroup_memory-ash/Cargo.toml

@@ -19,17 +19,19 @@ fn main() {
     #[cfg(not(target_os = "macos"))]
     {
         use difftest::scaffold::compute::{AshBackend, BufferConfig, BufferUsage, ComputeTest};
-        use spirv_builder::{ModuleResult, SpirvBuilder};
+        use difftest::spirv_builder::{
+            Capability, MetadataPrintout, ModuleResult, ShaderPanicStrategy, SpirvBuilder,
+        };
         use std::fs;
 
         // Build the Rust shader to SPIR-V
         let builder = SpirvBuilder::new(".", "spirv-unknown-vulkan1.2")
-            .print_metadata(spirv_builder::MetadataPrintout::None)
+            .print_metadata(MetadataPrintout::None)
             .release(true)
             .multimodule(false)
-            .shader_panic_strategy(spirv_builder::ShaderPanicStrategy::SilentExit)
+            .shader_panic_strategy(ShaderPanicStrategy::SilentExit)
             .preserve_bindings(true)
-            .capability(spirv_builder::Capability::VulkanMemoryModel);
+            .capability(Capability::VulkanMemoryModel);
 
         let artifact = builder.build().expect("Failed to build SPIR-V");
 

tests/difftests/tests/arch/workgroup_memory/workgroup_memory-ash/src/main.rs

@@ -17,6 +17,5 @@ spirv-std.workspace = true
 
 # CPU deps
 [target.'cfg(not(target_arch = "spirv"))'.dependencies]
-spirv-builder.workspace = true
 difftest.workspace = true
 bytemuck.workspace = true