shaders: use import for View struct definition

The View struct definition had significantly deviated from the local copy in tilemap[-atlas].wgsl even before Bevy 0.8 and only ever worked because nothing except for the first field was accessed. Use an #import to ensure that we always get the correct defintion from Bevy itself.
StarArawn · Aug 1, 2022 · 8d7fcbb · 8d7fcbb
1 parent db0861a
commit 8d7fcbb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/src/render/shaders/tilemap-atlas.wgsl b/src/render/shaders/tilemap-atlas.wgsl
@@ -1,8 +1,5 @@
-struct View {
-    view_proj: mat4x4<f32>,
-    projection: mat4x4<f32>,
-    world_position: vec3<f32>,
-};
+#import bevy_sprite::mesh2d_view_types
+
 @group(0) @binding(0)
 var<uniform> view: View;
 

diff --git a/src/render/shaders/tilemap.wgsl b/src/render/shaders/tilemap.wgsl
@@ -1,8 +1,5 @@
-struct View {
-    view_proj: mat4x4<f32>,
-    projection: mat4x4<f32>,
-    world_position: vec3<f32>,
-};
+#import bevy_sprite::mesh2d_view_types
+
 @group(0) @binding(0)
 var<uniform> view: View;