Fix embeded shader as entry point

Author: beicause

crates/bevy_shader/src/shader_cache.rs

@@ -210,7 +210,7 @@ impl<ShaderModule, RenderDevice> ShaderCache<ShaderModule, RenderDevice> {
                         if let ShaderImport::AssetPath(path) = shader.import_path() {
                             let shader_resolver =
                                 ShaderResolver::new(&self.asset_paths, &self.shaders);
-                            let module_path = wesl::ModulePath::from_path(path);
+                            let module_path = wesl_module_path_from_asset_path(path);
                             let mut compiler_options = wesl::CompileOptions {
                                 imports: true,
                                 condcomp: true,
@@ -360,24 +360,8 @@ impl<ShaderModule, RenderDevice> ShaderCache<ShaderModule, RenderDevice> {
         if let Source::Wesl(_) = shader.source
             && let ShaderImport::AssetPath(path) = shader.import_path()
         {
-            use bevy_asset::{io::AssetSourceId, AssetPath};
-            use std::path::PathBuf;
-
-            let asset_path = AssetPath::from(path);
-            let module_path = if let AssetSourceId::Name(source) = asset_path.source() {
-                let mut comp = vec!["bevy_asset".to_string()];
-                let mut path = PathBuf::new();
-                path.push(source.as_ref());
-                path.push(asset_path.path());
-                comp.extend(wesl::ModulePath::from_path(path).components);
-                wesl::ModulePath {
-                    origin: wesl::syntax::PathOrigin::Package,
-                    components: comp,
-                }
-            } else {
-                wesl::ModulePath::from_path(asset_path.path())
-            };
-            self.asset_paths.insert(module_path, id);
+            self.asset_paths
+                .insert(wesl_module_path_from_asset_path(path), id);
         }
         self.shaders.insert(id, shader);
         pipelines_to_queue
@@ -427,6 +411,27 @@ impl<'a> wesl::Resolver for ShaderResolver<'a> {
     }
 }
 
+#[cfg(feature = "shader_format_wesl")]
+fn wesl_module_path_from_asset_path(path: &String) -> wesl::ModulePath {
+    use bevy_asset::{io::AssetSourceId, AssetPath};
+    use std::path::PathBuf;
+
+    let asset_path = AssetPath::from(path);
+    if let AssetSourceId::Name(source) = asset_path.source() {
+        let mut comp = vec!["bevy_asset".to_string()];
+        let mut path = PathBuf::new();
+        path.push(source.as_ref());
+        path.push(asset_path.path());
+        comp.extend(wesl::ModulePath::from_path(path).components);
+        wesl::ModulePath {
+            origin: wesl::syntax::PathOrigin::Package,
+            components: comp,
+        }
+    } else {
+        wesl::ModulePath::from_path(asset_path.path())
+    }
+}
+
 /// Type of error returned by a `PipelineCache` when the creation of a GPU pipeline object failed.
 #[cfg_attr(
     not(target_arch = "wasm32"),

examples/shader/files/custom_material.wesl

@@ -0,0 +1,16 @@
+import super::util::make_polka_dots;
+import bevy_asset::embedded::shader_material_wesl::files::vertex_attr;
+
+struct CustomMaterial {
+    // Needed for 16-bit alignment on WebGL2
+    time: vec4<f32>,
+}
+
+@group(3) @binding(0) var<uniform> material: CustomMaterial;
+
+@fragment
+fn fragment(
+    mesh: vertex_attr::VertexOutput,
+) -> @location(0) vec4<f32> {
+    return make_polka_dots(mesh.uv, material.time.x);
+}

assets/shaders/util.wesl renamed to examples/shader/files/util.wesl

@@ -13,7 +13,8 @@ use bevy::{
 };
 
 /// This example uses shader source files from the assets subdirectory
-const FRAGMENT_SHADER_ASSET_PATH: &str = "shaders/custom_material.wesl";
+const FRAGMENT_SHADER_ASSET_PATH: &str =
+    "embedded://shader_material_wesl/files/custom_material.wesl";
 
 fn main() {
     App::new()
@@ -47,10 +48,13 @@ struct VertexAttrShader(Handle<Shader>);
 
 impl Plugin for CustomMaterialPlugin {
     fn build(&self, app: &mut App) {
+        embedded_asset!(app, "examples/shader", "files/custom_material.wesl");
         embedded_asset!(app, "examples/shader", "files/vertex_attr.wesl");
+        embedded_asset!(app, "examples/shader", "files/util.wesl");
 
         let asset_server = app.world_mut().resource_mut::<AssetServer>();
-        let utils_handle = asset_server.load::<Shader>("shaders/util.wesl");
+        let utils_handle =
+            asset_server.load::<Shader>("embedded://shader_material_wesl/files/util.wesl");
         let vertex_attr_handle =
             asset_server.load::<Shader>("embedded://shader_material_wesl/files/vertex_attr.wesl");
         app.insert_resource(UtilityShader(utils_handle))