target enum: change SpirvBuilder.target from String to SpirvTargetEnv

Author: Firestar99

crates/spirv-builder/Cargo.toml

@@ -38,7 +38,7 @@ clap = ["dep:clap"]
 [dependencies]
 rustc_codegen_spirv = { workspace = true, optional = true }
 rustc_codegen_spirv-types = { workspace = true }
-rustc_codegen_spirv-target-specs = { workspace = true }
+rustc_codegen_spirv-target-specs = { workspace = true, features = ["serde"] }
 
 memchr = "2.4"
 raw-string = "0.3.5"

crates/spirv-builder/src/lib.rs

@@ -99,8 +99,6 @@ pub use rustc_codegen_spirv_target_specs::TARGET_SPEC_DIR_PATH;
 pub enum SpirvBuilderError {
     #[error("`target` must be set, for example `spirv-unknown-vulkan1.2`")]
     MissingTarget,
-    #[error("Error parsing target: {0}")]
-    SpirvTargetParseError(#[from] SpirvTargetParseError),
     #[error("`path_to_crate` must be set")]
     MissingCratePath,
     #[error("crate path '{0}' does not exist")]
@@ -378,9 +376,13 @@ pub struct SpirvBuilder {
     /// The target triple, eg. `spirv-unknown-vulkan1.2`
     #[cfg_attr(
         feature = "clap",
-        clap(long, default_value = "spirv-unknown-vulkan1.2")
+        clap(
+            long,
+            default_value = "spirv-unknown-vulkan1.2",
+            value_parser = SpirvTargetEnv::parse_triple
+        )
     )]
-    pub target: Option<String>,
+    pub target: Option<SpirvTargetEnv>,
     /// Cargo features specification for building the shader crate.
     #[cfg_attr(feature = "clap", clap(flatten))]
     #[serde(flatten)]
@@ -486,7 +488,7 @@ impl Default for SpirvBuilder {
 }
 
 impl SpirvBuilder {
-    pub fn new(path_to_crate: impl AsRef<Path>, target: impl Into<String>) -> Self {
+    pub fn new(path_to_crate: impl AsRef<Path>, target: impl Into<SpirvTargetEnv>) -> Self {
         Self {
             path_to_crate: Some(path_to_crate.as_ref().to_owned()),
             target: Some(target.into()),
@@ -756,11 +758,7 @@ fn join_checking_for_separators(strings: Vec<impl Borrow<str>>, sep: &str) -> St
 
 // Returns path to the metadata json.
 fn invoke_rustc(builder: &SpirvBuilder) -> Result<PathBuf, SpirvBuilderError> {
-    let target = builder
-        .target
-        .as_ref()
-        .ok_or(SpirvBuilderError::MissingTarget)?;
-    let target = SpirvTargetEnv::parse_triple(target)?;
+    let target = builder.target.ok_or(SpirvBuilderError::MissingTarget)?;
     let path_to_crate = builder
         .path_to_crate
         .as_ref()

examples/multibuilder/src/main.rs

@@ -1,9 +1,9 @@
-use spirv_builder::{MetadataPrintout, SpirvBuilder};
+use spirv_builder::{MetadataPrintout, SpirvBuilder, SpirvTargetEnv};
 
 fn main() {
     let result = SpirvBuilder::new(
         concat!(env!("CARGO_MANIFEST_DIR"), "/../shaders/sky-shader"),
-        "spirv-unknown-spv1.3",
+        SpirvTargetEnv::Vulkan_1_3,
     )
     .print_metadata(MetadataPrintout::DependencyOnly)
     .multimodule(true)

examples/runners/ash/src/main.rs

@@ -91,7 +91,7 @@ use std::{
 
 use clap::Parser;
 
-use spirv_builder::{MetadataPrintout, SpirvBuilder};
+use spirv_builder::{MetadataPrintout, SpirvBuilder, SpirvTargetEnv};
 
 use shared::ShaderConstants;
 
@@ -247,7 +247,7 @@ pub fn compile_shaders() -> Vec<SpvFile> {
 
     SpirvBuilder::new(
         concat!(env!("CARGO_MANIFEST_DIR"), "/../../shaders/sky-shader"),
-        "spirv-unknown-vulkan1.1",
+        SpirvTargetEnv::Vulkan_1_1,
     )
     .print_metadata(MetadataPrintout::None)
     .shader_panic_strategy(spirv_builder::ShaderPanicStrategy::DebugPrintfThenExit {

examples/runners/wgpu/builder/src/main.rs

@@ -1,4 +1,4 @@
-use spirv_builder::{MetadataPrintout, SpirvBuilder};
+use spirv_builder::{MetadataPrintout, SpirvBuilder, SpirvTargetEnv};
 use std::env;
 use std::error::Error;
 use std::fs;
@@ -7,7 +7,7 @@ use std::path::Path;
 fn build_shader(path_to_crate: &str, codegen_names: bool) -> Result<(), Box<dyn Error>> {
     let builder_dir = &Path::new(env!("CARGO_MANIFEST_DIR"));
     let path_to_crate = builder_dir.join(path_to_crate);
-    let result = SpirvBuilder::new(path_to_crate, "spirv-unknown-vulkan1.1")
+    let result = SpirvBuilder::new(path_to_crate, SpirvTargetEnv::Vulkan_1_1)
         .print_metadata(MetadataPrintout::Full)
         .build()?;
     if codegen_names {

examples/runners/wgpu/src/lib.rs

@@ -73,6 +73,7 @@
 
 use clap::Parser;
 use clap::ValueEnum;
+use spirv_builder::SpirvTargetEnv;
 use std::borrow::Cow;
 use strum::{Display, EnumString};
 
@@ -152,7 +153,7 @@ fn maybe_watch(
 
         let has_debug_printf = options.force_spirv_passthru;
 
-        let builder = SpirvBuilder::new(crate_path, "spirv-unknown-vulkan1.1")
+        let builder = SpirvBuilder::new(crate_path, SpirvTargetEnv::Vulkan_1_1)
             .print_metadata(MetadataPrintout::None)
             .shader_panic_strategy(if has_debug_printf {
                 spirv_builder::ShaderPanicStrategy::DebugPrintfThenExit {

tests/difftests/lib/src/scaffold/compute/wgpu.rs

@@ -2,7 +2,7 @@ use crate::config::Config;
 use anyhow::Context;
 use bytemuck::Pod;
 use futures::executor::block_on;
-use spirv_builder::{ModuleResult, SpirvBuilder};
+use spirv_builder::{ModuleResult, SpirvBuilder, SpirvTargetEnv};
 use std::{
     borrow::Cow,
     env,
@@ -36,7 +36,7 @@ impl ComputeShader for RustComputeShader {
         &self,
         device: &wgpu::Device,
     ) -> anyhow::Result<(wgpu::ShaderModule, Option<String>)> {
-        let builder = SpirvBuilder::new(&self.path, "spirv-unknown-vulkan1.1")
+        let builder = SpirvBuilder::new(&self.path, SpirvTargetEnv::Vulkan_1_2)
             .print_metadata(spirv_builder::MetadataPrintout::None)
             .release(true)
             .multimodule(false)