Revert bevy_sprite_render rename in shaders (#20644)

tychedelia · web-flow · commit b6922f98d1ec · 2025-08-18T23:11:28.000Z
Fixes #20643
diff --git a/assets/shaders/custom_gltf_2d.wgsl b/assets/shaders/custom_gltf_2d.wgsl
@@ -1,4 +1,4 @@
-#import bevy_sprite_render::{
+#import bevy_sprite::{
     mesh2d_view_bindings::globals,
     mesh2d_functions::{get_world_from_local, mesh2d_position_local_to_clip},
 }
diff --git a/assets/shaders/custom_material_2d.wgsl b/assets/shaders/custom_material_2d.wgsl
@@ -1,4 +1,4 @@
-#import bevy_sprite_render::mesh2d_vertex_output::VertexOutput
+#import bevy_sprite::mesh2d_vertex_output::VertexOutput
 // we can import items from shader modules in the assets folder with a quoted path
 #import "shaders/custom_material_import.wgsl"::COLOR_MULTIPLIER
 
diff --git a/assets/shaders/custom_vertex_attribute.wgsl b/assets/shaders/custom_vertex_attribute.wgsl
@@ -1,4 +1,4 @@
-// For 2d replace `bevy_pbr::mesh_functions` with `bevy_sprite_render::mesh2d_functions`
+// For 2d replace `bevy_pbr::mesh_functions` with `bevy_sprite::mesh2d_functions`
 // and `mesh_position_local_to_clip` with `mesh2d_position_local_to_clip`.
 #import bevy_pbr::mesh_functions::{get_world_from_local, mesh_position_local_to_clip}
 
diff --git a/crates/bevy_sprite_render/src/mesh2d/color_material.wgsl b/crates/bevy_sprite_render/src/mesh2d/color_material.wgsl
@@ -1,4 +1,4 @@
-#import bevy_sprite_render::{
+#import bevy_sprite::{
     mesh2d_vertex_output::VertexOutput,
     mesh2d_view_bindings::view,
 }
diff --git a/crates/bevy_sprite_render/src/mesh2d/mesh2d.wgsl b/crates/bevy_sprite_render/src/mesh2d/mesh2d.wgsl
@@ -1,4 +1,4 @@
-#import bevy_sprite_render::{
+#import bevy_sprite::{
     mesh2d_functions as mesh_functions,
     mesh2d_vertex_output::VertexOutput,
     mesh2d_view_bindings::view,
diff --git a/crates/bevy_sprite_render/src/mesh2d/mesh2d_bindings.wgsl b/crates/bevy_sprite_render/src/mesh2d/mesh2d_bindings.wgsl
@@ -1,6 +1,6 @@
-#define_import_path bevy_sprite_render::mesh2d_bindings
+#define_import_path bevy_sprite::mesh2d_bindings
 
-#import bevy_sprite_render::mesh2d_types::Mesh2d
+#import bevy_sprite::mesh2d_types::Mesh2d
 
 #ifdef PER_OBJECT_BUFFER_BATCH_SIZE
 @group(1) @binding(0) var<uniform> mesh: array<Mesh2d, #{PER_OBJECT_BUFFER_BATCH_SIZE}u>;
diff --git a/crates/bevy_sprite_render/src/mesh2d/mesh2d_functions.wgsl b/crates/bevy_sprite_render/src/mesh2d/mesh2d_functions.wgsl
@@ -1,6 +1,6 @@
-#define_import_path bevy_sprite_render::mesh2d_functions
+#define_import_path bevy_sprite::mesh2d_functions
 
-#import bevy_sprite_render::{
+#import bevy_sprite::{
     mesh2d_view_bindings::view,
     mesh2d_bindings::mesh,
 }
diff --git a/crates/bevy_sprite_render/src/mesh2d/mesh2d_types.wgsl b/crates/bevy_sprite_render/src/mesh2d/mesh2d_types.wgsl
@@ -1,4 +1,4 @@
-#define_import_path bevy_sprite_render::mesh2d_types
+#define_import_path bevy_sprite::mesh2d_types
 
 struct Mesh2d {
     // Affine 4x3 matrix transposed to 3x4
diff --git a/crates/bevy_sprite_render/src/mesh2d/mesh2d_vertex_output.wgsl b/crates/bevy_sprite_render/src/mesh2d/mesh2d_vertex_output.wgsl
@@ -1,4 +1,4 @@
-#define_import_path bevy_sprite_render::mesh2d_vertex_output
+#define_import_path bevy_sprite::mesh2d_vertex_output
 
 struct VertexOutput {
     // this is `clip position` when the struct is used as a vertex stage output 
diff --git a/crates/bevy_sprite_render/src/mesh2d/mesh2d_view_bindings.wgsl b/crates/bevy_sprite_render/src/mesh2d/mesh2d_view_bindings.wgsl
@@ -1,4 +1,4 @@
-#define_import_path bevy_sprite_render::mesh2d_view_bindings
+#define_import_path bevy_sprite::mesh2d_view_bindings
 
 #import bevy_render::view::View
 #import bevy_render::globals::Globals
diff --git a/crates/bevy_sprite_render/src/mesh2d/mesh2d_view_types.wgsl b/crates/bevy_sprite_render/src/mesh2d/mesh2d_view_types.wgsl
@@ -1,4 +1,4 @@
-#define_import_path bevy_sprite_render::mesh2d_view_types
+#define_import_path bevy_sprite::mesh2d_view_types
 
 #import bevy_render::view
 #import bevy_render::globals
diff --git a/crates/bevy_sprite_render/src/mesh2d/wireframe2d.wgsl b/crates/bevy_sprite_render/src/mesh2d/wireframe2d.wgsl
@@ -1,4 +1,4 @@
-#import bevy_sprite_render::mesh2d_vertex_output::VertexOutput
+#import bevy_sprite::mesh2d_vertex_output::VertexOutput
 
 struct PushConstants {
     color: vec4<f32>
diff --git a/crates/bevy_sprite_render/src/render/sprite.wgsl b/crates/bevy_sprite_render/src/render/sprite.wgsl
@@ -7,7 +7,7 @@
     view::View,
 }
 
-#import bevy_sprite_render::sprite_view_bindings::view
+#import bevy_sprite::sprite_view_bindings::view
 
 struct VertexInput {
     @builtin(vertex_index) index: u32,
diff --git a/crates/bevy_sprite_render/src/render/sprite_view_bindings.wgsl b/crates/bevy_sprite_render/src/render/sprite_view_bindings.wgsl
@@ -1,4 +1,4 @@
-#define_import_path bevy_sprite_render::sprite_view_bindings
+#define_import_path bevy_sprite::sprite_view_bindings
 
 #import bevy_render::view::View
 
diff --git a/crates/bevy_sprite_render/src/tilemap_chunk/tilemap_chunk_material.wgsl b/crates/bevy_sprite_render/src/tilemap_chunk/tilemap_chunk_material.wgsl
@@ -1,4 +1,4 @@
-#import bevy_sprite_render::{
+#import bevy_sprite::{
     mesh2d_functions as mesh_functions,
     mesh2d_view_bindings::view,
     mesh2d_vertex_output::VertexOutput,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#import bevy_sprite_render::{`
	`1`	`+#import bevy_sprite::{`
`2`	`2`	`mesh2d_view_bindings::globals,`
`3`	`3`	`mesh2d_functions::{get_world_from_local, mesh2d_position_local_to_clip},`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#import bevy_sprite_render::mesh2d_vertex_output::VertexOutput`
	`1`	`+#import bevy_sprite::mesh2d_vertex_output::VertexOutput`
`2`	`2`	`// we can import items from shader modules in the assets folder with a quoted path`
`3`	`3`	`#import "shaders/custom_material_import.wgsl"::COLOR_MULTIPLIER`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-// For 2d replace `bevy_pbr::mesh_functions` with `bevy_sprite_render::mesh2d_functions`
	`1`	+// For 2d replace `bevy_pbr::mesh_functions` with `bevy_sprite::mesh2d_functions`
`2`	`2`	// and `mesh_position_local_to_clip` with `mesh2d_position_local_to_clip`.
`3`	`3`	`#import bevy_pbr::mesh_functions::{get_world_from_local, mesh_position_local_to_clip}`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-#define_import_path bevy_sprite_render::mesh2d_functions`
	`1`	`+#define_import_path bevy_sprite::mesh2d_functions`
`2`	`2`
`3`		`-#import bevy_sprite_render::{`
	`3`	`+#import bevy_sprite::{`
`4`	`4`	`mesh2d_view_bindings::view,`
`5`	`5`	`mesh2d_bindings::mesh,`
`6`	`6`	`}`