diff --git a/Cargo.lock b/Cargo.lock index 3a9952ac..ec941949 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -285,30 +285,15 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec 0.6.3", -] - [[package]] name = "bit-set" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" dependencies = [ - "bit-vec 0.7.0", + "bit-vec", ] -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - [[package]] name = "bit-vec" version = "0.7.0" @@ -1757,27 +1742,6 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "naga" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e3524642f53d9af419ab5e8dd29d3ba155708267667c2f3f06c88c9e130843" -dependencies = [ - "bit-set 0.5.3", - "bitflags 2.6.0", - "codespan-reporting", - "hexf-parse", - "indexmap", - "log", - "num-traits", - "petgraph", - "rustc-hash 1.1.0", - "spirv", - "termcolor", - "thiserror", - "unicode-xid", -] - [[package]] name = "naga" version = "22.1.0" @@ -1785,7 +1749,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bd5a652b6faf21496f2cfd88fc49989c8db0825d1f6746b1a71a6ede24a63ad" dependencies = [ "arrayvec", - "bit-set 0.6.0", + "bit-set", "bitflags 2.6.0", "cfg_aliases 0.1.1", "codespan-reporting", @@ -2568,8 +2532,7 @@ dependencies = [ "image 0.24.9", "img-diff", "log", - "naga 0.19.2", - "naga 22.1.0", + "naga", "pathdiff", "pretty_assertions", "quote", @@ -3332,7 +3295,7 @@ dependencies = [ "document-features", "js-sys", "log", - "naga 22.1.0", + "naga", "parking_lot", "profiling", "raw-window-handle", @@ -3353,14 +3316,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0348c840d1051b8e86c3bcd31206080c5e71e5933dabd79be1ce732b0b2f089a" dependencies = [ "arrayvec", - "bit-vec 0.7.0", + "bit-vec", "bitflags 2.6.0", "bytemuck", "cfg_aliases 0.1.1", "document-features", "indexmap", "log", - "naga 22.1.0", + "naga", "once_cell", "parking_lot", "profiling", @@ -3381,7 +3344,7 @@ dependencies = [ "android_system_properties", "arrayvec", "ash", - "bit-set 0.6.0", + "bit-set", "bitflags 2.6.0", "block", "cfg_aliases 0.1.1", @@ -3399,7 +3362,7 @@ dependencies = [ "libloading", "log", "metal", - "naga 22.1.0", + "naga", "ndk-sys 0.5.0+25.2.9519653", "objc", "once_cell", diff --git a/Cargo.toml b/Cargo.toml index a39b07f2..dce08e7d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ glam = { version = "0.24.2", default-features = false } gltf = { version = "1.4,1", features = ["KHR_lights_punctual", "KHR_materials_unlit", "KHR_materials_emissive_strength", "extras", "extensions"] } image = "0.24" log = "0.4" -naga = { version = "0.19", features = ["spv-in", "wgsl-out", "wgsl-in", "msl-out"] } +naga = { version = "22.1.0", features = ["spv-in", "wgsl-out", "wgsl-in", "msl-out"] } pretty_assertions = "1.4.0" proc-macro2 = { version = "1.0", features = ["span-locations"] } rustc-hash = "1.1" @@ -40,6 +40,7 @@ web-sys = "0.3" winit = { version = "0.30" } wgpu = "22.1.0" + [profile.dev] opt-level = 1 diff --git a/crates/renderling/Cargo.toml b/crates/renderling/Cargo.toml index 41e7f7f8..6d56210f 100644 --- a/crates/renderling/Cargo.toml +++ b/crates/renderling/Cargo.toml @@ -88,11 +88,8 @@ tutorial_slabbed_renderlet = [] wasm = ["wgpu/fragile-send-sync-non-atomic-wasm"] -[patch.crates-io] -spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu" } - [build-dependencies] -naga = { version = "22.1", features = ["spv-in", "wgsl-out", "wgsl-in", "msl-out"] } +naga = {workspace = true} pathdiff = "0.2.2" quote = "1.0" serde = {version = "1.0", features = ["derive"]} diff --git a/crates/renderling/src/build.rs b/crates/renderling/src/build.rs index abdc75fc..c11bbd31 100644 --- a/crates/renderling/src/build.rs +++ b/crates/renderling/src/build.rs @@ -25,10 +25,13 @@ impl core::fmt::Display for Linkage { wgsl_entry_point, } = self; + let fn_name = self.fn_name(); + let quote = quote! { use crate::linkage::ShaderLinkage; - mod native { + #[cfg(not(target_arch = "wasm32"))] + mod target { pub const ENTRY_POINT: &str = #entry_point; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { @@ -36,21 +39,23 @@ impl core::fmt::Display for Linkage { } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating native linkage for {}", #fn_name); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into() } } } - - mod web { + #[cfg(target_arch = "wasm32")] + mod target { pub const ENTRY_POINT: &str = #wgsl_entry_point; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { - wgpu::include_spirv!(#wgsl_include_source_path) + wgpu::include_wgsl!(#wgsl_include_source_path) } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating web linkage for {}", #fn_name); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into() @@ -58,20 +63,8 @@ impl core::fmt::Display for Linkage { } } - pub fn linkage_native(device: &wgpu::Device) -> ShaderLinkage { - native::linkage(device) - } - - pub fn linkage_web(device: &wgpu::Device) -> ShaderLinkage { - web::linkage(device) - } - pub fn linkage(device: &wgpu::Device) -> ShaderLinkage { - if cfg!(feature = "wasm") { - web::linkage(device) - } else { - native::linkage(device) - } + target::linkage(device) } }; diff --git a/crates/renderling/src/linkage/bloom_downsample_fragment.rs b/crates/renderling/src/linkage/bloom_downsample_fragment.rs index 77638ca3..2b09fdae 100644 --- a/crates/renderling/src/linkage/bloom_downsample_fragment.rs +++ b/crates/renderling/src/linkage/bloom_downsample_fragment.rs @@ -1,40 +1,37 @@ #![allow(dead_code)] //! Automatically generated by Renderling's `build.rs`. use crate::linkage::ShaderLinkage; -mod native { +#[cfg(not(target_arch = "wasm32"))] +mod target { pub const ENTRY_POINT: &str = "bloom::bloom_downsample_fragment"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { wgpu::include_spirv!("../../shaders/bloom-bloom_downsample_fragment.spv") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!( + "creating native linkage for {}", + "bloom_downsample_fragment" + ); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -mod web { +#[cfg(target_arch = "wasm32")] +mod target { pub const ENTRY_POINT: &str = "bloombloom_downsample_fragment"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { - wgpu::include_spirv!("../../shaders/bloom-bloom_downsample_fragment.wgsl") + wgpu::include_wgsl!("../../shaders/bloom-bloom_downsample_fragment.wgsl") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating web linkage for {}", "bloom_downsample_fragment"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -pub fn linkage_native(device: &wgpu::Device) -> ShaderLinkage { - native::linkage(device) -} -pub fn linkage_web(device: &wgpu::Device) -> ShaderLinkage { - web::linkage(device) -} pub fn linkage(device: &wgpu::Device) -> ShaderLinkage { - if cfg!(feature = "wasm") { - web::linkage(device) - } else { - native::linkage(device) - } + target::linkage(device) } diff --git a/crates/renderling/src/linkage/bloom_mix_fragment.rs b/crates/renderling/src/linkage/bloom_mix_fragment.rs index 59df4831..a1691afe 100644 --- a/crates/renderling/src/linkage/bloom_mix_fragment.rs +++ b/crates/renderling/src/linkage/bloom_mix_fragment.rs @@ -1,40 +1,34 @@ #![allow(dead_code)] //! Automatically generated by Renderling's `build.rs`. use crate::linkage::ShaderLinkage; -mod native { +#[cfg(not(target_arch = "wasm32"))] +mod target { pub const ENTRY_POINT: &str = "bloom::bloom_mix_fragment"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { wgpu::include_spirv!("../../shaders/bloom-bloom_mix_fragment.spv") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating native linkage for {}", "bloom_mix_fragment"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -mod web { +#[cfg(target_arch = "wasm32")] +mod target { pub const ENTRY_POINT: &str = "bloombloom_mix_fragment"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { - wgpu::include_spirv!("../../shaders/bloom-bloom_mix_fragment.wgsl") + wgpu::include_wgsl!("../../shaders/bloom-bloom_mix_fragment.wgsl") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating web linkage for {}", "bloom_mix_fragment"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -pub fn linkage_native(device: &wgpu::Device) -> ShaderLinkage { - native::linkage(device) -} -pub fn linkage_web(device: &wgpu::Device) -> ShaderLinkage { - web::linkage(device) -} pub fn linkage(device: &wgpu::Device) -> ShaderLinkage { - if cfg!(feature = "wasm") { - web::linkage(device) - } else { - native::linkage(device) - } + target::linkage(device) } diff --git a/crates/renderling/src/linkage/bloom_upsample_fragment.rs b/crates/renderling/src/linkage/bloom_upsample_fragment.rs index 5afea1ac..b564d3ab 100644 --- a/crates/renderling/src/linkage/bloom_upsample_fragment.rs +++ b/crates/renderling/src/linkage/bloom_upsample_fragment.rs @@ -1,40 +1,34 @@ #![allow(dead_code)] //! Automatically generated by Renderling's `build.rs`. use crate::linkage::ShaderLinkage; -mod native { +#[cfg(not(target_arch = "wasm32"))] +mod target { pub const ENTRY_POINT: &str = "bloom::bloom_upsample_fragment"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { wgpu::include_spirv!("../../shaders/bloom-bloom_upsample_fragment.spv") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating native linkage for {}", "bloom_upsample_fragment"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -mod web { +#[cfg(target_arch = "wasm32")] +mod target { pub const ENTRY_POINT: &str = "bloombloom_upsample_fragment"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { - wgpu::include_spirv!("../../shaders/bloom-bloom_upsample_fragment.wgsl") + wgpu::include_wgsl!("../../shaders/bloom-bloom_upsample_fragment.wgsl") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating web linkage for {}", "bloom_upsample_fragment"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -pub fn linkage_native(device: &wgpu::Device) -> ShaderLinkage { - native::linkage(device) -} -pub fn linkage_web(device: &wgpu::Device) -> ShaderLinkage { - web::linkage(device) -} pub fn linkage(device: &wgpu::Device) -> ShaderLinkage { - if cfg!(feature = "wasm") { - web::linkage(device) - } else { - native::linkage(device) - } + target::linkage(device) } diff --git a/crates/renderling/src/linkage/bloom_vertex.rs b/crates/renderling/src/linkage/bloom_vertex.rs index e7033323..788c68d7 100644 --- a/crates/renderling/src/linkage/bloom_vertex.rs +++ b/crates/renderling/src/linkage/bloom_vertex.rs @@ -1,40 +1,34 @@ #![allow(dead_code)] //! Automatically generated by Renderling's `build.rs`. use crate::linkage::ShaderLinkage; -mod native { +#[cfg(not(target_arch = "wasm32"))] +mod target { pub const ENTRY_POINT: &str = "bloom::bloom_vertex"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { wgpu::include_spirv!("../../shaders/bloom-bloom_vertex.spv") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating native linkage for {}", "bloom_vertex"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -mod web { +#[cfg(target_arch = "wasm32")] +mod target { pub const ENTRY_POINT: &str = "bloombloom_vertex"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { - wgpu::include_spirv!("../../shaders/bloom-bloom_vertex.wgsl") + wgpu::include_wgsl!("../../shaders/bloom-bloom_vertex.wgsl") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating web linkage for {}", "bloom_vertex"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -pub fn linkage_native(device: &wgpu::Device) -> ShaderLinkage { - native::linkage(device) -} -pub fn linkage_web(device: &wgpu::Device) -> ShaderLinkage { - web::linkage(device) -} pub fn linkage(device: &wgpu::Device) -> ShaderLinkage { - if cfg!(feature = "wasm") { - web::linkage(device) - } else { - native::linkage(device) - } + target::linkage(device) } diff --git a/crates/renderling/src/linkage/brdf_lut_convolution_fragment.rs b/crates/renderling/src/linkage/brdf_lut_convolution_fragment.rs index b5e4df4d..70616eda 100644 --- a/crates/renderling/src/linkage/brdf_lut_convolution_fragment.rs +++ b/crates/renderling/src/linkage/brdf_lut_convolution_fragment.rs @@ -1,40 +1,40 @@ #![allow(dead_code)] //! Automatically generated by Renderling's `build.rs`. use crate::linkage::ShaderLinkage; -mod native { +#[cfg(not(target_arch = "wasm32"))] +mod target { pub const ENTRY_POINT: &str = "convolution::brdf_lut_convolution_fragment"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { wgpu::include_spirv!("../../shaders/convolution-brdf_lut_convolution_fragment.spv") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!( + "creating native linkage for {}", + "brdf_lut_convolution_fragment" + ); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -mod web { +#[cfg(target_arch = "wasm32")] +mod target { pub const ENTRY_POINT: &str = "convolutionbrdf_lut_convolution_fragment"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { - wgpu::include_spirv!("../../shaders/convolution-brdf_lut_convolution_fragment.wgsl") + wgpu::include_wgsl!("../../shaders/convolution-brdf_lut_convolution_fragment.wgsl") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!( + "creating web linkage for {}", + "brdf_lut_convolution_fragment" + ); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -pub fn linkage_native(device: &wgpu::Device) -> ShaderLinkage { - native::linkage(device) -} -pub fn linkage_web(device: &wgpu::Device) -> ShaderLinkage { - web::linkage(device) -} pub fn linkage(device: &wgpu::Device) -> ShaderLinkage { - if cfg!(feature = "wasm") { - web::linkage(device) - } else { - native::linkage(device) - } + target::linkage(device) } diff --git a/crates/renderling/src/linkage/brdf_lut_convolution_vertex.rs b/crates/renderling/src/linkage/brdf_lut_convolution_vertex.rs index bff53dad..9b568294 100644 --- a/crates/renderling/src/linkage/brdf_lut_convolution_vertex.rs +++ b/crates/renderling/src/linkage/brdf_lut_convolution_vertex.rs @@ -1,40 +1,37 @@ #![allow(dead_code)] //! Automatically generated by Renderling's `build.rs`. use crate::linkage::ShaderLinkage; -mod native { +#[cfg(not(target_arch = "wasm32"))] +mod target { pub const ENTRY_POINT: &str = "convolution::brdf_lut_convolution_vertex"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { wgpu::include_spirv!("../../shaders/convolution-brdf_lut_convolution_vertex.spv") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!( + "creating native linkage for {}", + "brdf_lut_convolution_vertex" + ); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -mod web { +#[cfg(target_arch = "wasm32")] +mod target { pub const ENTRY_POINT: &str = "convolutionbrdf_lut_convolution_vertex"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { - wgpu::include_spirv!("../../shaders/convolution-brdf_lut_convolution_vertex.wgsl") + wgpu::include_wgsl!("../../shaders/convolution-brdf_lut_convolution_vertex.wgsl") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating web linkage for {}", "brdf_lut_convolution_vertex"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -pub fn linkage_native(device: &wgpu::Device) -> ShaderLinkage { - native::linkage(device) -} -pub fn linkage_web(device: &wgpu::Device) -> ShaderLinkage { - web::linkage(device) -} pub fn linkage(device: &wgpu::Device) -> ShaderLinkage { - if cfg!(feature = "wasm") { - web::linkage(device) - } else { - native::linkage(device) - } + target::linkage(device) } diff --git a/crates/renderling/src/linkage/compute_frustum_culling.rs b/crates/renderling/src/linkage/compute_frustum_culling.rs index a9b17f06..9ef46a9a 100644 --- a/crates/renderling/src/linkage/compute_frustum_culling.rs +++ b/crates/renderling/src/linkage/compute_frustum_culling.rs @@ -1,40 +1,34 @@ #![allow(dead_code)] //! Automatically generated by Renderling's `build.rs`. use crate::linkage::ShaderLinkage; -mod native { +#[cfg(not(target_arch = "wasm32"))] +mod target { pub const ENTRY_POINT: &str = "cull::compute_frustum_culling"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { wgpu::include_spirv!("../../shaders/cull-compute_frustum_culling.spv") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating native linkage for {}", "compute_frustum_culling"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -mod web { +#[cfg(target_arch = "wasm32")] +mod target { pub const ENTRY_POINT: &str = "cullcompute_frustum_culling"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { - wgpu::include_spirv!("../../shaders/cull-compute_frustum_culling.wgsl") + wgpu::include_wgsl!("../../shaders/cull-compute_frustum_culling.wgsl") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating web linkage for {}", "compute_frustum_culling"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -pub fn linkage_native(device: &wgpu::Device) -> ShaderLinkage { - native::linkage(device) -} -pub fn linkage_web(device: &wgpu::Device) -> ShaderLinkage { - web::linkage(device) -} pub fn linkage(device: &wgpu::Device) -> ShaderLinkage { - if cfg!(feature = "wasm") { - web::linkage(device) - } else { - native::linkage(device) - } + target::linkage(device) } diff --git a/crates/renderling/src/linkage/generate_mipmap_fragment.rs b/crates/renderling/src/linkage/generate_mipmap_fragment.rs index 596f84e6..339c5ccd 100644 --- a/crates/renderling/src/linkage/generate_mipmap_fragment.rs +++ b/crates/renderling/src/linkage/generate_mipmap_fragment.rs @@ -1,40 +1,34 @@ #![allow(dead_code)] //! Automatically generated by Renderling's `build.rs`. use crate::linkage::ShaderLinkage; -mod native { +#[cfg(not(target_arch = "wasm32"))] +mod target { pub const ENTRY_POINT: &str = "convolution::generate_mipmap_fragment"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { wgpu::include_spirv!("../../shaders/convolution-generate_mipmap_fragment.spv") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating native linkage for {}", "generate_mipmap_fragment"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -mod web { +#[cfg(target_arch = "wasm32")] +mod target { pub const ENTRY_POINT: &str = "convolutiongenerate_mipmap_fragment"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { - wgpu::include_spirv!("../../shaders/convolution-generate_mipmap_fragment.wgsl") + wgpu::include_wgsl!("../../shaders/convolution-generate_mipmap_fragment.wgsl") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating web linkage for {}", "generate_mipmap_fragment"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -pub fn linkage_native(device: &wgpu::Device) -> ShaderLinkage { - native::linkage(device) -} -pub fn linkage_web(device: &wgpu::Device) -> ShaderLinkage { - web::linkage(device) -} pub fn linkage(device: &wgpu::Device) -> ShaderLinkage { - if cfg!(feature = "wasm") { - web::linkage(device) - } else { - native::linkage(device) - } + target::linkage(device) } diff --git a/crates/renderling/src/linkage/generate_mipmap_vertex.rs b/crates/renderling/src/linkage/generate_mipmap_vertex.rs index 69e20019..355550d8 100644 --- a/crates/renderling/src/linkage/generate_mipmap_vertex.rs +++ b/crates/renderling/src/linkage/generate_mipmap_vertex.rs @@ -1,40 +1,34 @@ #![allow(dead_code)] //! Automatically generated by Renderling's `build.rs`. use crate::linkage::ShaderLinkage; -mod native { +#[cfg(not(target_arch = "wasm32"))] +mod target { pub const ENTRY_POINT: &str = "convolution::generate_mipmap_vertex"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { wgpu::include_spirv!("../../shaders/convolution-generate_mipmap_vertex.spv") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating native linkage for {}", "generate_mipmap_vertex"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -mod web { +#[cfg(target_arch = "wasm32")] +mod target { pub const ENTRY_POINT: &str = "convolutiongenerate_mipmap_vertex"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { - wgpu::include_spirv!("../../shaders/convolution-generate_mipmap_vertex.wgsl") + wgpu::include_wgsl!("../../shaders/convolution-generate_mipmap_vertex.wgsl") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating web linkage for {}", "generate_mipmap_vertex"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -pub fn linkage_native(device: &wgpu::Device) -> ShaderLinkage { - native::linkage(device) -} -pub fn linkage_web(device: &wgpu::Device) -> ShaderLinkage { - web::linkage(device) -} pub fn linkage(device: &wgpu::Device) -> ShaderLinkage { - if cfg!(feature = "wasm") { - web::linkage(device) - } else { - native::linkage(device) - } + target::linkage(device) } diff --git a/crates/renderling/src/linkage/prefilter_environment_cubemap_fragment.rs b/crates/renderling/src/linkage/prefilter_environment_cubemap_fragment.rs index 575cd660..e91964ec 100644 --- a/crates/renderling/src/linkage/prefilter_environment_cubemap_fragment.rs +++ b/crates/renderling/src/linkage/prefilter_environment_cubemap_fragment.rs @@ -1,42 +1,40 @@ #![allow(dead_code)] //! Automatically generated by Renderling's `build.rs`. use crate::linkage::ShaderLinkage; -mod native { +#[cfg(not(target_arch = "wasm32"))] +mod target { pub const ENTRY_POINT: &str = "convolution::prefilter_environment_cubemap_fragment"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { wgpu::include_spirv!("../../shaders/convolution-prefilter_environment_cubemap_fragment.spv") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!( + "creating native linkage for {}", + "prefilter_environment_cubemap_fragment" + ); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -mod web { +#[cfg(target_arch = "wasm32")] +mod target { pub const ENTRY_POINT: &str = "convolutionprefilter_environment_cubemap_fragment"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { - wgpu::include_spirv!( - "../../shaders/convolution-prefilter_environment_cubemap_fragment.wgsl" - ) + wgpu::include_wgsl!("../../shaders/convolution-prefilter_environment_cubemap_fragment.wgsl") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!( + "creating web linkage for {}", + "prefilter_environment_cubemap_fragment" + ); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -pub fn linkage_native(device: &wgpu::Device) -> ShaderLinkage { - native::linkage(device) -} -pub fn linkage_web(device: &wgpu::Device) -> ShaderLinkage { - web::linkage(device) -} pub fn linkage(device: &wgpu::Device) -> ShaderLinkage { - if cfg!(feature = "wasm") { - web::linkage(device) - } else { - native::linkage(device) - } + target::linkage(device) } diff --git a/crates/renderling/src/linkage/prefilter_environment_cubemap_vertex.rs b/crates/renderling/src/linkage/prefilter_environment_cubemap_vertex.rs index ecd1110a..f5bd22ca 100644 --- a/crates/renderling/src/linkage/prefilter_environment_cubemap_vertex.rs +++ b/crates/renderling/src/linkage/prefilter_environment_cubemap_vertex.rs @@ -1,40 +1,40 @@ #![allow(dead_code)] //! Automatically generated by Renderling's `build.rs`. use crate::linkage::ShaderLinkage; -mod native { +#[cfg(not(target_arch = "wasm32"))] +mod target { pub const ENTRY_POINT: &str = "convolution::prefilter_environment_cubemap_vertex"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { wgpu::include_spirv!("../../shaders/convolution-prefilter_environment_cubemap_vertex.spv") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!( + "creating native linkage for {}", + "prefilter_environment_cubemap_vertex" + ); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -mod web { +#[cfg(target_arch = "wasm32")] +mod target { pub const ENTRY_POINT: &str = "convolutionprefilter_environment_cubemap_vertex"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { - wgpu::include_spirv!("../../shaders/convolution-prefilter_environment_cubemap_vertex.wgsl") + wgpu::include_wgsl!("../../shaders/convolution-prefilter_environment_cubemap_vertex.wgsl") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!( + "creating web linkage for {}", + "prefilter_environment_cubemap_vertex" + ); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -pub fn linkage_native(device: &wgpu::Device) -> ShaderLinkage { - native::linkage(device) -} -pub fn linkage_web(device: &wgpu::Device) -> ShaderLinkage { - web::linkage(device) -} pub fn linkage(device: &wgpu::Device) -> ShaderLinkage { - if cfg!(feature = "wasm") { - web::linkage(device) - } else { - native::linkage(device) - } + target::linkage(device) } diff --git a/crates/renderling/src/linkage/renderlet_fragment.rs b/crates/renderling/src/linkage/renderlet_fragment.rs index db502e62..9f261f3e 100644 --- a/crates/renderling/src/linkage/renderlet_fragment.rs +++ b/crates/renderling/src/linkage/renderlet_fragment.rs @@ -1,40 +1,34 @@ #![allow(dead_code)] //! Automatically generated by Renderling's `build.rs`. use crate::linkage::ShaderLinkage; -mod native { +#[cfg(not(target_arch = "wasm32"))] +mod target { pub const ENTRY_POINT: &str = "stage::renderlet_fragment"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { wgpu::include_spirv!("../../shaders/stage-renderlet_fragment.spv") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating native linkage for {}", "renderlet_fragment"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -mod web { +#[cfg(target_arch = "wasm32")] +mod target { pub const ENTRY_POINT: &str = "stagerenderlet_fragment"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { - wgpu::include_spirv!("../../shaders/stage-renderlet_fragment.wgsl") + wgpu::include_wgsl!("../../shaders/stage-renderlet_fragment.wgsl") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating web linkage for {}", "renderlet_fragment"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -pub fn linkage_native(device: &wgpu::Device) -> ShaderLinkage { - native::linkage(device) -} -pub fn linkage_web(device: &wgpu::Device) -> ShaderLinkage { - web::linkage(device) -} pub fn linkage(device: &wgpu::Device) -> ShaderLinkage { - if cfg!(feature = "wasm") { - web::linkage(device) - } else { - native::linkage(device) - } + target::linkage(device) } diff --git a/crates/renderling/src/linkage/renderlet_vertex.rs b/crates/renderling/src/linkage/renderlet_vertex.rs index df5c05bc..e0715022 100644 --- a/crates/renderling/src/linkage/renderlet_vertex.rs +++ b/crates/renderling/src/linkage/renderlet_vertex.rs @@ -1,40 +1,34 @@ #![allow(dead_code)] //! Automatically generated by Renderling's `build.rs`. use crate::linkage::ShaderLinkage; -mod native { +#[cfg(not(target_arch = "wasm32"))] +mod target { pub const ENTRY_POINT: &str = "stage::renderlet_vertex"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { wgpu::include_spirv!("../../shaders/stage-renderlet_vertex.spv") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating native linkage for {}", "renderlet_vertex"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -mod web { +#[cfg(target_arch = "wasm32")] +mod target { pub const ENTRY_POINT: &str = "stagerenderlet_vertex"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { - wgpu::include_spirv!("../../shaders/stage-renderlet_vertex.wgsl") + wgpu::include_wgsl!("../../shaders/stage-renderlet_vertex.wgsl") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating web linkage for {}", "renderlet_vertex"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -pub fn linkage_native(device: &wgpu::Device) -> ShaderLinkage { - native::linkage(device) -} -pub fn linkage_web(device: &wgpu::Device) -> ShaderLinkage { - web::linkage(device) -} pub fn linkage(device: &wgpu::Device) -> ShaderLinkage { - if cfg!(feature = "wasm") { - web::linkage(device) - } else { - native::linkage(device) - } + target::linkage(device) } diff --git a/crates/renderling/src/linkage/skybox_cubemap_fragment.rs b/crates/renderling/src/linkage/skybox_cubemap_fragment.rs index 0cdd6d03..1ecf4602 100644 --- a/crates/renderling/src/linkage/skybox_cubemap_fragment.rs +++ b/crates/renderling/src/linkage/skybox_cubemap_fragment.rs @@ -1,40 +1,34 @@ #![allow(dead_code)] //! Automatically generated by Renderling's `build.rs`. use crate::linkage::ShaderLinkage; -mod native { +#[cfg(not(target_arch = "wasm32"))] +mod target { pub const ENTRY_POINT: &str = "skybox::skybox_cubemap_fragment"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { wgpu::include_spirv!("../../shaders/skybox-skybox_cubemap_fragment.spv") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating native linkage for {}", "skybox_cubemap_fragment"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -mod web { +#[cfg(target_arch = "wasm32")] +mod target { pub const ENTRY_POINT: &str = "skyboxskybox_cubemap_fragment"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { - wgpu::include_spirv!("../../shaders/skybox-skybox_cubemap_fragment.wgsl") + wgpu::include_wgsl!("../../shaders/skybox-skybox_cubemap_fragment.wgsl") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating web linkage for {}", "skybox_cubemap_fragment"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -pub fn linkage_native(device: &wgpu::Device) -> ShaderLinkage { - native::linkage(device) -} -pub fn linkage_web(device: &wgpu::Device) -> ShaderLinkage { - web::linkage(device) -} pub fn linkage(device: &wgpu::Device) -> ShaderLinkage { - if cfg!(feature = "wasm") { - web::linkage(device) - } else { - native::linkage(device) - } + target::linkage(device) } diff --git a/crates/renderling/src/linkage/skybox_cubemap_vertex.rs b/crates/renderling/src/linkage/skybox_cubemap_vertex.rs index 732f5c7c..2f792fe2 100644 --- a/crates/renderling/src/linkage/skybox_cubemap_vertex.rs +++ b/crates/renderling/src/linkage/skybox_cubemap_vertex.rs @@ -1,40 +1,34 @@ #![allow(dead_code)] //! Automatically generated by Renderling's `build.rs`. use crate::linkage::ShaderLinkage; -mod native { +#[cfg(not(target_arch = "wasm32"))] +mod target { pub const ENTRY_POINT: &str = "skybox::skybox_cubemap_vertex"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { wgpu::include_spirv!("../../shaders/skybox-skybox_cubemap_vertex.spv") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating native linkage for {}", "skybox_cubemap_vertex"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -mod web { +#[cfg(target_arch = "wasm32")] +mod target { pub const ENTRY_POINT: &str = "skyboxskybox_cubemap_vertex"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { - wgpu::include_spirv!("../../shaders/skybox-skybox_cubemap_vertex.wgsl") + wgpu::include_wgsl!("../../shaders/skybox-skybox_cubemap_vertex.wgsl") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating web linkage for {}", "skybox_cubemap_vertex"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -pub fn linkage_native(device: &wgpu::Device) -> ShaderLinkage { - native::linkage(device) -} -pub fn linkage_web(device: &wgpu::Device) -> ShaderLinkage { - web::linkage(device) -} pub fn linkage(device: &wgpu::Device) -> ShaderLinkage { - if cfg!(feature = "wasm") { - web::linkage(device) - } else { - native::linkage(device) - } + target::linkage(device) } diff --git a/crates/renderling/src/linkage/skybox_equirectangular_fragment.rs b/crates/renderling/src/linkage/skybox_equirectangular_fragment.rs index 41d63b60..9ef6fc56 100644 --- a/crates/renderling/src/linkage/skybox_equirectangular_fragment.rs +++ b/crates/renderling/src/linkage/skybox_equirectangular_fragment.rs @@ -1,40 +1,40 @@ #![allow(dead_code)] //! Automatically generated by Renderling's `build.rs`. use crate::linkage::ShaderLinkage; -mod native { +#[cfg(not(target_arch = "wasm32"))] +mod target { pub const ENTRY_POINT: &str = "skybox::skybox_equirectangular_fragment"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { wgpu::include_spirv!("../../shaders/skybox-skybox_equirectangular_fragment.spv") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!( + "creating native linkage for {}", + "skybox_equirectangular_fragment" + ); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -mod web { +#[cfg(target_arch = "wasm32")] +mod target { pub const ENTRY_POINT: &str = "skyboxskybox_equirectangular_fragment"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { - wgpu::include_spirv!("../../shaders/skybox-skybox_equirectangular_fragment.wgsl") + wgpu::include_wgsl!("../../shaders/skybox-skybox_equirectangular_fragment.wgsl") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!( + "creating web linkage for {}", + "skybox_equirectangular_fragment" + ); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -pub fn linkage_native(device: &wgpu::Device) -> ShaderLinkage { - native::linkage(device) -} -pub fn linkage_web(device: &wgpu::Device) -> ShaderLinkage { - web::linkage(device) -} pub fn linkage(device: &wgpu::Device) -> ShaderLinkage { - if cfg!(feature = "wasm") { - web::linkage(device) - } else { - native::linkage(device) - } + target::linkage(device) } diff --git a/crates/renderling/src/linkage/skybox_vertex.rs b/crates/renderling/src/linkage/skybox_vertex.rs index d89c2a6a..a7acf011 100644 --- a/crates/renderling/src/linkage/skybox_vertex.rs +++ b/crates/renderling/src/linkage/skybox_vertex.rs @@ -1,40 +1,34 @@ #![allow(dead_code)] //! Automatically generated by Renderling's `build.rs`. use crate::linkage::ShaderLinkage; -mod native { +#[cfg(not(target_arch = "wasm32"))] +mod target { pub const ENTRY_POINT: &str = "skybox::skybox_vertex"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { wgpu::include_spirv!("../../shaders/skybox-skybox_vertex.spv") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating native linkage for {}", "skybox_vertex"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -mod web { +#[cfg(target_arch = "wasm32")] +mod target { pub const ENTRY_POINT: &str = "skyboxskybox_vertex"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { - wgpu::include_spirv!("../../shaders/skybox-skybox_vertex.wgsl") + wgpu::include_wgsl!("../../shaders/skybox-skybox_vertex.wgsl") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating web linkage for {}", "skybox_vertex"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -pub fn linkage_native(device: &wgpu::Device) -> ShaderLinkage { - native::linkage(device) -} -pub fn linkage_web(device: &wgpu::Device) -> ShaderLinkage { - web::linkage(device) -} pub fn linkage(device: &wgpu::Device) -> ShaderLinkage { - if cfg!(feature = "wasm") { - web::linkage(device) - } else { - native::linkage(device) - } + target::linkage(device) } diff --git a/crates/renderling/src/linkage/tonemapping_fragment.rs b/crates/renderling/src/linkage/tonemapping_fragment.rs index 1e3939a2..29ae25d4 100644 --- a/crates/renderling/src/linkage/tonemapping_fragment.rs +++ b/crates/renderling/src/linkage/tonemapping_fragment.rs @@ -1,40 +1,34 @@ #![allow(dead_code)] //! Automatically generated by Renderling's `build.rs`. use crate::linkage::ShaderLinkage; -mod native { +#[cfg(not(target_arch = "wasm32"))] +mod target { pub const ENTRY_POINT: &str = "tonemapping::tonemapping_fragment"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { wgpu::include_spirv!("../../shaders/tonemapping-tonemapping_fragment.spv") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating native linkage for {}", "tonemapping_fragment"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -mod web { +#[cfg(target_arch = "wasm32")] +mod target { pub const ENTRY_POINT: &str = "tonemappingtonemapping_fragment"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { - wgpu::include_spirv!("../../shaders/tonemapping-tonemapping_fragment.wgsl") + wgpu::include_wgsl!("../../shaders/tonemapping-tonemapping_fragment.wgsl") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating web linkage for {}", "tonemapping_fragment"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -pub fn linkage_native(device: &wgpu::Device) -> ShaderLinkage { - native::linkage(device) -} -pub fn linkage_web(device: &wgpu::Device) -> ShaderLinkage { - web::linkage(device) -} pub fn linkage(device: &wgpu::Device) -> ShaderLinkage { - if cfg!(feature = "wasm") { - web::linkage(device) - } else { - native::linkage(device) - } + target::linkage(device) } diff --git a/crates/renderling/src/linkage/tonemapping_vertex.rs b/crates/renderling/src/linkage/tonemapping_vertex.rs index a4f9938c..dad930fc 100644 --- a/crates/renderling/src/linkage/tonemapping_vertex.rs +++ b/crates/renderling/src/linkage/tonemapping_vertex.rs @@ -1,40 +1,34 @@ #![allow(dead_code)] //! Automatically generated by Renderling's `build.rs`. use crate::linkage::ShaderLinkage; -mod native { +#[cfg(not(target_arch = "wasm32"))] +mod target { pub const ENTRY_POINT: &str = "tonemapping::tonemapping_vertex"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { wgpu::include_spirv!("../../shaders/tonemapping-tonemapping_vertex.spv") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating native linkage for {}", "tonemapping_vertex"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -mod web { +#[cfg(target_arch = "wasm32")] +mod target { pub const ENTRY_POINT: &str = "tonemappingtonemapping_vertex"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { - wgpu::include_spirv!("../../shaders/tonemapping-tonemapping_vertex.wgsl") + wgpu::include_wgsl!("../../shaders/tonemapping-tonemapping_vertex.wgsl") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating web linkage for {}", "tonemapping_vertex"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -pub fn linkage_native(device: &wgpu::Device) -> ShaderLinkage { - native::linkage(device) -} -pub fn linkage_web(device: &wgpu::Device) -> ShaderLinkage { - web::linkage(device) -} pub fn linkage(device: &wgpu::Device) -> ShaderLinkage { - if cfg!(feature = "wasm") { - web::linkage(device) - } else { - native::linkage(device) - } + target::linkage(device) } diff --git a/crates/renderling/src/linkage/tutorial_implicit_isosceles_vertex.rs b/crates/renderling/src/linkage/tutorial_implicit_isosceles_vertex.rs index 4146cd8a..cc679ff2 100644 --- a/crates/renderling/src/linkage/tutorial_implicit_isosceles_vertex.rs +++ b/crates/renderling/src/linkage/tutorial_implicit_isosceles_vertex.rs @@ -1,40 +1,40 @@ #![allow(dead_code)] //! Automatically generated by Renderling's `build.rs`. use crate::linkage::ShaderLinkage; -mod native { +#[cfg(not(target_arch = "wasm32"))] +mod target { pub const ENTRY_POINT: &str = "tutorial::tutorial_implicit_isosceles_vertex"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { wgpu::include_spirv!("../../shaders/tutorial-tutorial_implicit_isosceles_vertex.spv") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!( + "creating native linkage for {}", + "tutorial_implicit_isosceles_vertex" + ); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -mod web { +#[cfg(target_arch = "wasm32")] +mod target { pub const ENTRY_POINT: &str = "tutorialtutorial_implicit_isosceles_vertex"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { - wgpu::include_spirv!("../../shaders/tutorial-tutorial_implicit_isosceles_vertex.wgsl") + wgpu::include_wgsl!("../../shaders/tutorial-tutorial_implicit_isosceles_vertex.wgsl") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!( + "creating web linkage for {}", + "tutorial_implicit_isosceles_vertex" + ); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -pub fn linkage_native(device: &wgpu::Device) -> ShaderLinkage { - native::linkage(device) -} -pub fn linkage_web(device: &wgpu::Device) -> ShaderLinkage { - web::linkage(device) -} pub fn linkage(device: &wgpu::Device) -> ShaderLinkage { - if cfg!(feature = "wasm") { - web::linkage(device) - } else { - native::linkage(device) - } + target::linkage(device) } diff --git a/crates/renderling/src/linkage/tutorial_passthru_fragment.rs b/crates/renderling/src/linkage/tutorial_passthru_fragment.rs index f9a00d0d..30e6172a 100644 --- a/crates/renderling/src/linkage/tutorial_passthru_fragment.rs +++ b/crates/renderling/src/linkage/tutorial_passthru_fragment.rs @@ -1,40 +1,37 @@ #![allow(dead_code)] //! Automatically generated by Renderling's `build.rs`. use crate::linkage::ShaderLinkage; -mod native { +#[cfg(not(target_arch = "wasm32"))] +mod target { pub const ENTRY_POINT: &str = "tutorial::tutorial_passthru_fragment"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { wgpu::include_spirv!("../../shaders/tutorial-tutorial_passthru_fragment.spv") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!( + "creating native linkage for {}", + "tutorial_passthru_fragment" + ); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -mod web { +#[cfg(target_arch = "wasm32")] +mod target { pub const ENTRY_POINT: &str = "tutorialtutorial_passthru_fragment"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { - wgpu::include_spirv!("../../shaders/tutorial-tutorial_passthru_fragment.wgsl") + wgpu::include_wgsl!("../../shaders/tutorial-tutorial_passthru_fragment.wgsl") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating web linkage for {}", "tutorial_passthru_fragment"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -pub fn linkage_native(device: &wgpu::Device) -> ShaderLinkage { - native::linkage(device) -} -pub fn linkage_web(device: &wgpu::Device) -> ShaderLinkage { - web::linkage(device) -} pub fn linkage(device: &wgpu::Device) -> ShaderLinkage { - if cfg!(feature = "wasm") { - web::linkage(device) - } else { - native::linkage(device) - } + target::linkage(device) } diff --git a/crates/renderling/src/linkage/tutorial_slabbed_renderlet.rs b/crates/renderling/src/linkage/tutorial_slabbed_renderlet.rs index d451c544..a2cf0d9f 100644 --- a/crates/renderling/src/linkage/tutorial_slabbed_renderlet.rs +++ b/crates/renderling/src/linkage/tutorial_slabbed_renderlet.rs @@ -1,40 +1,37 @@ #![allow(dead_code)] //! Automatically generated by Renderling's `build.rs`. use crate::linkage::ShaderLinkage; -mod native { +#[cfg(not(target_arch = "wasm32"))] +mod target { pub const ENTRY_POINT: &str = "tutorial::tutorial_slabbed_renderlet"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { wgpu::include_spirv!("../../shaders/tutorial-tutorial_slabbed_renderlet.spv") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!( + "creating native linkage for {}", + "tutorial_slabbed_renderlet" + ); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -mod web { +#[cfg(target_arch = "wasm32")] +mod target { pub const ENTRY_POINT: &str = "tutorialtutorial_slabbed_renderlet"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { - wgpu::include_spirv!("../../shaders/tutorial-tutorial_slabbed_renderlet.wgsl") + wgpu::include_wgsl!("../../shaders/tutorial-tutorial_slabbed_renderlet.wgsl") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating web linkage for {}", "tutorial_slabbed_renderlet"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -pub fn linkage_native(device: &wgpu::Device) -> ShaderLinkage { - native::linkage(device) -} -pub fn linkage_web(device: &wgpu::Device) -> ShaderLinkage { - web::linkage(device) -} pub fn linkage(device: &wgpu::Device) -> ShaderLinkage { - if cfg!(feature = "wasm") { - web::linkage(device) - } else { - native::linkage(device) - } + target::linkage(device) } diff --git a/crates/renderling/src/linkage/tutorial_slabbed_vertices.rs b/crates/renderling/src/linkage/tutorial_slabbed_vertices.rs index 4b6177c5..a1a9f95a 100644 --- a/crates/renderling/src/linkage/tutorial_slabbed_vertices.rs +++ b/crates/renderling/src/linkage/tutorial_slabbed_vertices.rs @@ -1,40 +1,37 @@ #![allow(dead_code)] //! Automatically generated by Renderling's `build.rs`. use crate::linkage::ShaderLinkage; -mod native { +#[cfg(not(target_arch = "wasm32"))] +mod target { pub const ENTRY_POINT: &str = "tutorial::tutorial_slabbed_vertices"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { wgpu::include_spirv!("../../shaders/tutorial-tutorial_slabbed_vertices.spv") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!( + "creating native linkage for {}", + "tutorial_slabbed_vertices" + ); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -mod web { +#[cfg(target_arch = "wasm32")] +mod target { pub const ENTRY_POINT: &str = "tutorialtutorial_slabbed_vertices"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { - wgpu::include_spirv!("../../shaders/tutorial-tutorial_slabbed_vertices.wgsl") + wgpu::include_wgsl!("../../shaders/tutorial-tutorial_slabbed_vertices.wgsl") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!("creating web linkage for {}", "tutorial_slabbed_vertices"); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -pub fn linkage_native(device: &wgpu::Device) -> ShaderLinkage { - native::linkage(device) -} -pub fn linkage_web(device: &wgpu::Device) -> ShaderLinkage { - web::linkage(device) -} pub fn linkage(device: &wgpu::Device) -> ShaderLinkage { - if cfg!(feature = "wasm") { - web::linkage(device) - } else { - native::linkage(device) - } + target::linkage(device) } diff --git a/crates/renderling/src/linkage/tutorial_slabbed_vertices_no_instance.rs b/crates/renderling/src/linkage/tutorial_slabbed_vertices_no_instance.rs index b282bbf4..b6e0d949 100644 --- a/crates/renderling/src/linkage/tutorial_slabbed_vertices_no_instance.rs +++ b/crates/renderling/src/linkage/tutorial_slabbed_vertices_no_instance.rs @@ -1,40 +1,40 @@ #![allow(dead_code)] //! Automatically generated by Renderling's `build.rs`. use crate::linkage::ShaderLinkage; -mod native { +#[cfg(not(target_arch = "wasm32"))] +mod target { pub const ENTRY_POINT: &str = "tutorial::tutorial_slabbed_vertices_no_instance"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { wgpu::include_spirv!("../../shaders/tutorial-tutorial_slabbed_vertices_no_instance.spv") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!( + "creating native linkage for {}", + "tutorial_slabbed_vertices_no_instance" + ); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -mod web { +#[cfg(target_arch = "wasm32")] +mod target { pub const ENTRY_POINT: &str = "tutorialtutorial_slabbed_vertices_no_instance"; pub fn descriptor() -> wgpu::ShaderModuleDescriptor<'static> { - wgpu::include_spirv!("../../shaders/tutorial-tutorial_slabbed_vertices_no_instance.wgsl") + wgpu::include_wgsl!("../../shaders/tutorial-tutorial_slabbed_vertices_no_instance.wgsl") } pub fn linkage(device: &wgpu::Device) -> super::ShaderLinkage { + log::info!( + "creating web linkage for {}", + "tutorial_slabbed_vertices_no_instance" + ); super::ShaderLinkage { entry_point: ENTRY_POINT, module: device.create_shader_module(descriptor()).into(), } } } -pub fn linkage_native(device: &wgpu::Device) -> ShaderLinkage { - native::linkage(device) -} -pub fn linkage_web(device: &wgpu::Device) -> ShaderLinkage { - web::linkage(device) -} pub fn linkage(device: &wgpu::Device) -> ShaderLinkage { - if cfg!(feature = "wasm") { - web::linkage(device) - } else { - native::linkage(device) - } + target::linkage(device) }