fix: webgl2 GL_ANGLE_multi_draw isn't default

mosure · Jan 2, 2024 · ca123dc · ca123dc
1 parent 02ff96b
commit ca123dc
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/Cargo.toml b/Cargo.toml
@@ -101,8 +101,11 @@ web = [
   "planar",
   "sort_std",
   "viewer",
+  "webgl2",
 ]
 
+webgl2 = ["bevy/webgl2"]
+
 
 [dependencies]
 bevy-inspector-egui = { version = "0.22", optional = true }
@@ -139,7 +142,6 @@ features = [
   "bevy_core_pipeline",
   "bevy_render",
   "bevy_winit",
-  "webgl2",
 ]
 
 

diff --git a/src/render/gaussian.wgsl b/src/render/gaussian.wgsl
@@ -78,13 +78,23 @@ fn get_entry(index: u32) -> Entry {
 }
 #endif
 
+#ifdef WEBGL2
+struct GaussianVertexOutput {
+    @builtin(position) position: vec4<f32>,
+    @location(0) color: vec4<f32>,
+    @location(1) conic: vec3<f32>,
+    @location(2) uv: vec2<f32>,
+    @location(3) major_minor: vec2<f32>,
+};
+#else
 struct GaussianVertexOutput {
     @builtin(position) position: vec4<f32>,
     @location(0) @interpolate(flat) color: vec4<f32>,
     @location(1) @interpolate(flat) conic: vec3<f32>,
     @location(2) @interpolate(linear) uv: vec2<f32>,
     @location(3) @interpolate(linear) major_minor: vec2<f32>,
 };
+#endif
 
 
 // https://github.com/cvlab-epfl/gaussian-splatting-web/blob/905b3c0fb8961e42c79ef97e64609e82383ca1c2/src/shaders.ts#L185

diff --git a/src/render/mod.rs b/src/render/mod.rs
@@ -585,6 +585,10 @@ pub fn shader_defs(
     #[cfg(all(feature = "f32", feature = "buffer_texture"))]
     shader_defs.push("PLANAR_TEXTURE_F32".into());
 
+
+    #[cfg(feature = "webgl2")]
+    shader_defs.push("WEBGL2".into());
+
     match key.draw_mode {
         GaussianCloudDrawMode::All => {},
         GaussianCloudDrawMode::Selected => shader_defs.push("DRAW_SELECTED".into()),
@@ -1020,6 +1024,10 @@ impl<P: PhaseItem> RenderCommand<P> for DrawGaussianInstanced {
         pass.set_bind_group(2, &bind_groups.cloud_bind_group, &[]); // TODO: abstract source of cloud_bind_group (e.g. packed vs. planar)
         pass.set_bind_group(3, &bind_groups.sorted_bind_group, &[]);
 
+        #[cfg(feature = "webgl2")]
+        pass.draw(0..4, 0..gpu_gaussian_cloud.count as u32);
+
+        #[cfg(not(feature = "webgl2"))]
         pass.draw_indirect(&gpu_gaussian_cloud.draw_indirect_buffer, 0);
 
         RenderCommandResult::Success