Remove SPIRV entirely from wgpu-core

gfx-rs · Jun 21, 2021 · ab4ce22 · ab4ce22
1 parent da38b8b
commit ab4ce22
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 41 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/player/Cargo.toml b/player/Cargo.toml
@@ -29,7 +29,7 @@ features = ["replay"]
 [dependencies.wgc]
 path = "../wgpu-core"
 package = "wgpu-core"
-features = ["spirv", "replay", "raw-window-handle"]
+features = ["replay", "raw-window-handle"]
 
 [dev-dependencies]
 serde = "1"
diff --git a/player/src/lib.rs b/player/src/lib.rs
@@ -239,17 +239,15 @@ impl GlobalPlay for wgc::hub::Global<IdentityPassThroughFactory> {
                 self.bind_group_drop::<A>(id);
             }
             Action::CreateShaderModule { id, desc, data } => {
+                log::info!("Creating shader from {}", data);
+                let code = fs::read_to_string(dir.join(&data)).unwrap();
                 let source = if data.ends_with(".wgsl") {
-                    let code = fs::read_to_string(dir.join(data)).unwrap();
                     wgc::pipeline::ShaderModuleSource::Wgsl(Cow::Owned(code))
+                } else if data.ends_with(".ron") {
+                    let module = ron::de::from_str(&code).unwrap();
+                    wgc::pipeline::ShaderModuleSource::Naga(module)
                 } else {
-                    let byte_vec = fs::read(dir.join(&data))
-                        .unwrap_or_else(|e| panic!("Unable to open '{}': {:?}", data, e));
-                    let spv = byte_vec
-                        .chunks(4)
-                        .map(|c| u32::from_le_bytes([c[0], c[1], c[2], c[3]]))
-                        .collect::<Vec<_>>();
-                    wgc::pipeline::ShaderModuleSource::SpirV(Cow::Owned(spv))
+                    panic!("Unknown shader {}", data);
                 };
                 let (_, error) = self.device_create_shader_module::<A>(device, &desc, source, id);
                 if let Some(e) = error {

diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml
@@ -13,11 +13,10 @@ license = "MIT OR Apache-2.0"
 
 [features]
 default = []
-spirv = ["naga/spv-in"]
 # Enable API tracing
-trace = ["ron", "serde", "wgt/trace", "arrayvec/serde"]
+trace = ["ron", "serde", "wgt/trace", "arrayvec/serde", "naga/serialize"]
 # Enable API replaying
-replay = ["serde", "wgt/replay", "arrayvec/serde"]
+replay = ["serde", "wgt/replay", "arrayvec/serde", "naga/deserialize"]
 # Enable serializable compute/render passes, and bundle encoders.
 serial-pass = ["serde", "wgt/serde", "arrayvec/serde"]
 

diff --git a/wgpu-core/src/device/mod.rs b/wgpu-core/src/device/mod.rs
@@ -838,28 +838,6 @@ impl<A: HalApi> Device<A> {
         source: pipeline::ShaderModuleSource<'a>,
     ) -> Result<pipeline::ShaderModule<A>, pipeline::CreateShaderModuleError> {
         let module = match source {
-            #[cfg(feature = "spirv")]
-            pipeline::ShaderModuleSource::SpirV(spv) => {
-                profiling::scope!("naga::spv::parse");
-                // Parse the given shader code and store its representation.
-                let options = naga::front::spv::Options {
-                    adjust_coordinate_space: false, // we require NDC_Y_UP feature
-                    strict_capabilities: true,
-                    flow_graph_dump_prefix: None,
-                };
-                let parser = naga::front::spv::Parser::new(spv.iter().cloned(), &options);
-                match parser.parse() {
-                    Ok(module) => module,
-                    Err(err) => {
-                        log::warn!(
-                            "Failed to parse shader SPIR-V code for {:?}: {:?}",
-                            desc.label,
-                            err
-                        );
-                        return Err(pipeline::CreateShaderModuleError::Parsing);
-                    }
-                }
-            }
             pipeline::ShaderModuleSource::Wgsl(code) => {
                 profiling::scope!("naga::wgsl::parse_str");
                 // TODO: refactor the corresponding Naga error to be owned, and then
@@ -3486,9 +3464,10 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
                     pipeline::ShaderModuleSource::Wgsl(ref code) => {
                         trace.make_binary("wgsl", code.as_bytes())
                     }
-                    pipeline::ShaderModuleSource::Naga(_) => {
-                        // we don't want to enable Naga serialization just for this alone
-                        trace.make_binary("ron", &[])
+                    pipeline::ShaderModuleSource::Naga(ref module) => {
+                        let string =
+                            ron::ser::to_string_pretty(module, ron::Config::default()).unwrap();
+                        trace.make_binary("ron", string.as_bytes())
                     }
                 };
                 trace.add(trace::Action::CreateShaderModule {

diff --git a/wgpu-core/src/pipeline.rs b/wgpu-core/src/pipeline.rs
@@ -9,8 +9,6 @@ use std::borrow::Cow;
 use thiserror::Error;
 
 pub enum ShaderModuleSource<'a> {
-    #[cfg(feature = "spirv")]
-    SpirV(Cow<'a, [u32]>),
     Wgsl(Cow<'a, str>),
     Naga(naga::Module),
 }

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
@@ -17,7 +17,7 @@ all-features = true
 
 [features]
 default = []
-spirv = ["wgc/spirv"]
+spirv = ["naga/spv-in"]
 trace = ["serde", "wgc/trace"]
 replay = ["serde", "wgc/replay"]
 webgl = ["wgc"]
@@ -65,6 +65,11 @@ async-executor = "1.0"
 pollster = "0.2"
 env_logger = "0.8"
 
+[dependencies.naga]
+git = "https://github.com/gfx-rs/naga"
+tag = "gfx-26"
+optional = true
+
 # used to test all the example shaders
 [dev-dependencies.naga]
 git = "https://github.com/gfx-rs/naga"

diff --git a/wgpu/src/backend/direct.rs b/wgpu/src/backend/direct.rs
@@ -811,7 +811,18 @@ impl crate::Context for Context {
         };
         let source = match desc.source {
             #[cfg(feature = "spirv")]
-            ShaderSource::SpirV(ref spv) => wgc::pipeline::ShaderModuleSource::SpirV(Borrowed(spv)),
+            ShaderSource::SpirV(ref spv) => {
+                profiling::scope!("naga::spv::parse");
+                // Parse the given shader code and store its representation.
+                let options = naga::front::spv::Options {
+                    adjust_coordinate_space: false, // we require NDC_Y_UP feature
+                    strict_capabilities: true,
+                    flow_graph_dump_prefix: None,
+                };
+                let parser = naga::front::spv::Parser::new(spv.iter().cloned(), &options);
+                let module = parser.parse().unwrap();
+                wgc::pipeline::ShaderModuleSource::Naga(module)
+            }
             ShaderSource::Wgsl(ref code) => wgc::pipeline::ShaderModuleSource::Wgsl(Borrowed(code)),
         };
         let (id, error) = wgc::gfx_select!(