Various fixes for CI

Author: inner-daemons

Cargo.toml

@@ -74,7 +74,7 @@ authors = ["gfx-rs developers"]
 [workspace.dependencies]
 naga = { version = "29.0.0", path = "./naga" }
 naga-test = { path = "./naga-test" }
-naga-types = { path = "./naga-types" }
+naga-types = { version = "29.0.0", path = "./naga-types" }
 wgpu = { version = "29.0.0", path = "./wgpu", default-features = false, features = [
     "std",
     "serde",

naga-types/README.md

@@ -2,4 +2,4 @@
 
 Naga-types contains some types used by both naga and wgpu. Naga may be an optional dependency of wgpu in the future,
 so these can't live in naga. Additionally, naga is a mostly independent crate, so it cannot depend on wgpu-types.
-For this reason, the types must live in a naga-specific crate but not naga itself. Naga-types serves that purpose.
+For this reason, the types must live in a naga-specific crate but not naga itself. Naga-types serves that purpose.

naga/src/back/glsl/features.rs

@@ -85,7 +85,7 @@ impl FeaturesManager {
     }
 
     /// Checks that all required [`Features`] are available for the specified
-    /// [`Version`] otherwise returns an [`Error::MissingFeatures`].
+    /// [`GlslVersion`] otherwise returns an [`Error::MissingFeatures`].
     pub fn check_availability(&self, version: GlslVersion) -> BackendResult {
         // Will store all the features that are unavailable
         let mut missing = Features::empty();

naga/src/back/glsl/mod.rs

@@ -408,7 +408,7 @@ pub enum Error {
     /// A error occurred while writing to the output.
     #[error("Format error")]
     FmtError(#[from] FmtError),
-    /// The specified [`Version`] doesn't have all required [`Features`].
+    /// The specified [`GlslVersion`] doesn't have all required [`Features`].
     ///
     /// Contains the missing [`Features`].
     #[error("The selected version doesn't support {0:?}")]
@@ -417,7 +417,7 @@ pub enum Error {
     /// once in the entry point, which isn't supported.
     #[error("Multiple immediates aren't supported")]
     MultipleImmediateData,
-    /// The specified [`Version`] isn't supported.
+    /// The specified [`GlslVersion`] isn't supported.
     #[error("The specified version isn't supported")]
     VersionNotSupported,
     /// The entry point couldn't be found.

wgpu-hal/src/dx12/device.rs

@@ -418,7 +418,11 @@ impl super::Device {
 
         let source_name = stage.module.raw_name.as_deref();
 
-        let full_stage = format!("{}_{}", naga_stage.to_hlsl_str(), key.shader_model.to_str());
+        let full_stage = format!(
+            "{}_{}",
+            naga::back::hlsl::shader_stage_to_hlsl_str(naga_stage),
+            key.shader_model.to_str()
+        );
 
         let compiled_shader = self.compiler_container.compile(
             self,

wgpu-hal/src/lib.rs

@@ -241,6 +241,7 @@
 )]
 
 extern crate alloc;
+#[allow(unused_extern_crates)]
 extern crate naga_types as nt;
 extern crate wgpu_types as wgt;
 // Each of these backends needs `std` in some fashion; usually `std::thread` functions.

wgpu-types/Cargo.toml

@@ -40,7 +40,12 @@ default = ["std"]
 std = ["js-sys?/std", "web-sys?/std", "naga-types/std"]
 strict_asserts = []
 fragile-send-sync-non-atomic-wasm = []
-serde = ["dep:serde", "bitflags/serde", "naga-types/serialize", "naga-types/deserialize"]
+serde = [
+    "dep:serde",
+    "bitflags/serde",
+    "naga-types/serialize",
+    "naga-types/deserialize",
+]
 # Enables some internal instrumentation for debugging purposes.
 counters = []
 # Enables variants of `Trace` other than `Trace::Off`