Wrap ShaderSource::Naga in Cow<'static>

Cargo.toml

@@ -33,3 +33,5 @@ default-members = ["wgpu", "wgpu-hal", "wgpu-info"]
 #web-sys = { path = "../wasm-bindgen/crates/web-sys" }
 #js-sys = { path = "../wasm-bindgen/crates/js-sys" }
 #wasm-bindgen = { path = "../wasm-bindgen" }
+# https://github.com/gfx-rs/naga/pull/2013
+naga = { git = "https://github.com/daxpedda/naga", branch = "module-clone" }

deno_webgpu/Cargo.toml

@@ -16,3 +16,7 @@ serde = { version = "1.0", features = ["derive"] }
 tokio = { version = "1.17", features = ["full"] }
 wgpu-core = { path = "../wgpu-core", features = ["trace", "replay", "serde"] }
 wgpu-types = { path = "../wgpu-types", features = ["trace", "replay", "serde"] }
+
+# https://github.com/gfx-rs/naga/pull/2013
+[patch.crates-io]
+naga = { git = "https://github.com/daxpedda/naga", branch = "module-clone" }

wgpu-core/src/device/mod.rs

@@ -1202,7 +1202,7 @@ impl<A: HalApi> Device<A> {
                         inner,
                     })
                 })?;
-                (module, code.into_owned())
+                (Cow::Owned(module), code.into_owned())
             }
             pipeline::ShaderModuleSource::Naga(module) => (module, String::new()),
         };

wgpu-core/src/pipeline.rs

@@ -21,7 +21,7 @@ pub(crate) struct LateSizedBufferGroup {
 #[allow(clippy::large_enum_variant)]
 pub enum ShaderModuleSource<'a> {
     Wgsl(Cow<'a, str>),
-    Naga(naga::Module),
+    Naga(Cow<'static, naga::Module>),
 }
 
 #[derive(Clone, Debug)]

wgpu-hal/examples/halmark/main.rs

@@ -6,7 +6,13 @@ use hal::{
     Adapter as _, CommandEncoder as _, Device as _, Instance as _, Queue as _, Surface as _,
 };
 
-use std::{borrow::Borrow, iter, mem, num::NonZeroU32, ptr, time::Instant};
+use std::{
+    borrow::{Borrow, Cow},
+    iter, mem,
+    num::NonZeroU32,
+    ptr,
+    time::Instant,
+};
 
 const MAX_BUNNIES: usize = 1 << 20;
 const BUNNY_SIZE: f32 = 0.15 * 256.0;
@@ -143,7 +149,10 @@ impl<A: hal::Api> Example<A> {
             )
             .validate(&module)
             .unwrap();
-            hal::NagaShader { module, info }
+            hal::NagaShader {
+                module: Cow::Owned(module),
+                info,
+            }
         };
         let shader_desc = hal::ShaderModuleDescriptor {
             label: None,

wgpu-hal/src/lib.rs

@@ -83,7 +83,7 @@ pub mod api {
 pub use vulkan::UpdateAfterBindTypes;
 
 use std::{
-    borrow::Borrow,
+    borrow::{Borrow, Cow},
     fmt,
     num::{NonZeroU32, NonZeroU8},
     ops::{Range, RangeInclusive},
@@ -939,7 +939,7 @@ pub struct CommandEncoderDescriptor<'a, A: Api> {
 /// Naga shader module.
 pub struct NagaShader {
     /// Shader module IR.
-    pub module: naga::Module,
+    pub module: Cow<'static, naga::Module>,
     /// Analysis information of the module.
     pub info: naga::valid::ModuleInfo,
 }

wgpu/src/backend/direct.rs

@@ -10,6 +10,8 @@ use crate::{
 use arrayvec::ArrayVec;
 use parking_lot::Mutex;
 use smallvec::SmallVec;
+#[cfg(any(feature = "glsl", feature = "spirv"))]
+use std::borrow::Cow;
 use std::{
     borrow::Cow::Borrowed,
     error::Error,
@@ -1104,7 +1106,7 @@ impl crate::Context for Context {
                 };
                 let parser = naga::front::spv::Parser::new(spv.iter().cloned(), &options);
                 let module = parser.parse().unwrap();
-                wgc::pipeline::ShaderModuleSource::Naga(module)
+                wgc::pipeline::ShaderModuleSource::Naga(Cow::Owned(module))
             }
             #[cfg(feature = "glsl")]
             ShaderSource::Glsl {
@@ -1120,7 +1122,7 @@ impl crate::Context for Context {
                 let mut parser = naga::front::glsl::Parser::default();
                 let module = parser.parse(&options, shader).unwrap();
 
-                wgc::pipeline::ShaderModuleSource::Naga(module)
+                wgc::pipeline::ShaderModuleSource::Naga(Cow::Owned(module))
             }
             ShaderSource::Wgsl(ref code) => wgc::pipeline::ShaderModuleSource::Wgsl(Borrowed(code)),
             #[cfg(feature = "naga")]

wgpu/src/lib.rs

@@ -814,6 +814,7 @@ impl Drop for ShaderModule {
 ///
 /// Any necessary shader translation (e.g. from WGSL to SPIR-V or vice versa)
 /// will be done internally by wgpu.
+#[cfg_attr(feature = "naga", allow(clippy::large_enum_variant))]
 #[non_exhaustive]
 pub enum ShaderSource<'a> {
     /// SPIR-V module represented as a slice of words.
@@ -840,7 +841,7 @@ pub enum ShaderSource<'a> {
     /// Naga module.
     #[cfg(feature = "naga")]
     #[cfg_attr(docsrs, doc(cfg(feature = "naga")))]
-    Naga(naga::Module),
+    Naga(Cow<'static, naga::Module>),
 }
 
 /// Descriptor for use with [`Device::create_shader_module`].