Merge pull request #45 from jabuwu/fix_shader_defs

Fix WASM with proper shader defs
james-j-obrien · Sep 2, 2024 · b69a787 · b69a787
2 parents 2ea2e5b + ccfdd8d
commit b69a787
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/render/commands.rs b/src/render/commands.rs
@@ -309,12 +309,6 @@ impl<P: PhaseItem, T: ShapeData> RenderCommand<P> for DrawShape<T> {
         pass: &mut TrackedRenderPass<'w>,
     ) -> RenderCommandResult {
         let batch_range = item.batch_range();
-        #[cfg(all(feature = "webgl", target_arch = "wasm32"))]
-        pass.set_push_constants(
-            ShaderStages::VERTEX,
-            0,
-            &(batch_range.start as i32).to_le_bytes(),
-        );
         pass.set_vertex_buffer(0, quad.into_inner().buffer.slice(..));
         pass.draw(0..T::VERTICES, batch_range.clone());
 

diff --git a/src/render/mod.rs b/src/render/mod.rs
@@ -82,7 +82,7 @@ pub fn load_shaders(app: &mut App) {
         Shader::from_wgsl_with_defs,
         defs
     );
-    let defs = NgonData::shader_defs(app);
+    let defs = LineData::shader_defs(app);
     load_internal_asset!(
         app,
         LINE_HANDLE,
@@ -106,11 +106,13 @@ pub fn load_shaders(app: &mut App) {
         Shader::from_wgsl_with_defs,
         defs
     );
+    let defs = TriangleData::shader_defs(app);
     load_internal_asset!(
         app,
         TRIANGLE_HANDLE,
         "shaders/shapes/tri.wgsl",
-        Shader::from_wgsl
+        Shader::from_wgsl_with_defs,
+        defs
     );
 }