Avoid fragment attributes (#513)

* Do not use FragmentAttributes * Remove FragmentAttributes * Docs
asny · Nov 25, 2024 · 022ee81 · 022ee81
1 parent 7e6bfdc
commit 022ee81
Show file tree

Hide file tree

Showing 35 changed files with 179 additions and 606 deletions.
diff --git a/examples/fireworks/src/main.rs b/examples/fireworks/src/main.rs
@@ -13,13 +13,6 @@ impl Material for FireworksMaterial {
     fn fragment_shader_source(&self, _lights: &[&dyn Light]) -> String {
         include_str!("particles.frag").to_string()
     }
-    fn fragment_attributes(&self) -> FragmentAttributes {
-        FragmentAttributes {
-            uv: true,
-            color: true,
-            ..FragmentAttributes::NONE
-        }
-    }
     fn use_uniforms(&self, program: &Program, _camera: &Camera, _lights: &[&dyn Light]) {
         program.use_uniform("color", self.color.to_linear_srgb());
         program.use_uniform("fade", self.fade);

diff --git a/examples/logo/src/main.rs b/examples/logo/src/main.rs
@@ -84,13 +84,6 @@ impl Material for LogoMaterial<'_> {
         EffectMaterialId(0b1u16)
     }
 
-    fn fragment_attributes(&self) -> FragmentAttributes {
-        FragmentAttributes {
-            uv: true,
-            ..FragmentAttributes::NONE
-        }
-    }
-
     fn use_uniforms(&self, program: &Program, _camera: &Camera, _lights: &[&dyn Light]) {
         program.use_texture("image", &self.image);
     }

diff --git a/examples/mandelbrot/src/main.rs b/examples/mandelbrot/src/main.rs
@@ -7,13 +7,6 @@ impl Material for MandelbrotMaterial {
         include_str!("mandelbrot.frag").to_string()
     }
 
-    fn fragment_attributes(&self) -> FragmentAttributes {
-        FragmentAttributes {
-            position: true,
-            ..FragmentAttributes::NONE
-        }
-    }
-
     fn use_uniforms(&self, _program: &Program, _camera: &Camera, _lights: &[&dyn Light]) {}
     fn render_states(&self) -> RenderStates {
         RenderStates {

diff --git a/src/renderer.rs b/src/renderer.rs
@@ -412,31 +412,21 @@ pub fn render_with_material(
     material: impl Material,
     lights: &[&dyn Light],
 ) {
-    let fragment_attributes = material.fragment_attributes();
-    let id = combine_ids(
-        geometry.id(fragment_attributes),
-        material.id(),
-        lights.iter().map(|l| l.id()),
-    );
+    let id = combine_ids(geometry.id(), material.id(), lights.iter().map(|l| l.id()));
 
     let mut programs = context.programs.write().unwrap();
     let program = programs.entry(id).or_insert_with(|| {
         match Program::from_source(
             context,
-            &geometry.vertex_shader_source(fragment_attributes),
+            &geometry.vertex_shader_source(),
             &material.fragment_shader_source(lights),
         ) {
             Ok(program) => program,
             Err(err) => panic!("{}", err.to_string()),
         }
     });
     material.use_uniforms(program, camera, lights);
-    geometry.draw(
-        camera,
-        program,
-        material.render_states(),
-        fragment_attributes,
-    );
+    geometry.draw(camera, program, material.render_states());
 }
 
 ///
@@ -453,9 +443,8 @@ pub fn render_with_effect(
     color_texture: Option<ColorTexture>,
     depth_texture: Option<DepthTexture>,
 ) {
-    let fragment_attributes = effect.fragment_attributes();
     let id = combine_ids(
-        geometry.id(fragment_attributes),
+        geometry.id(),
         effect.id(color_texture, depth_texture),
         lights.iter().map(|l| l.id()),
     );
@@ -464,15 +453,15 @@ pub fn render_with_effect(
     let program = programs.entry(id).or_insert_with(|| {
         match Program::from_source(
             context,
-            &geometry.vertex_shader_source(fragment_attributes),
+            &geometry.vertex_shader_source(),
             &effect.fragment_shader_source(lights, color_texture, depth_texture),
         ) {
             Ok(program) => program,
             Err(err) => panic!("{}", err.to_string()),
         }
     });
     effect.use_uniforms(program, camera, lights, color_texture, depth_texture);
-    geometry.draw(camera, program, effect.render_states(), fragment_attributes);
+    geometry.draw(camera, program, effect.render_states());
 }
 
 ///
@@ -486,10 +475,6 @@ pub fn apply_screen_material(
     camera: &Camera,
     lights: &[&dyn Light],
 ) {
-    let fragment_attributes = material.fragment_attributes();
-    if fragment_attributes.normal || fragment_attributes.position || fragment_attributes.tangents {
-        panic!("Not possible to use the given material to render full screen, the full screen geometry only provides uv coordinates and color");
-    }
     let id = combine_ids(
         GeometryId::Screen,
         material.id(),
@@ -529,10 +514,6 @@ pub fn apply_screen_effect(
     color_texture: Option<ColorTexture>,
     depth_texture: Option<DepthTexture>,
 ) {
-    let fragment_attributes = effect.fragment_attributes();
-    if fragment_attributes.normal || fragment_attributes.position || fragment_attributes.tangents {
-        panic!("Not possible to use the given effect to render full screen, the full screen geometry only provides uv coordinates and color");
-    }
     let id = combine_ids(
         GeometryId::Screen,
         effect.id(color_texture, depth_texture),

diff --git a/src/renderer/effect.rs b/src/renderer/effect.rs
@@ -22,10 +22,6 @@ macro_rules! impl_effect_body {
             self.$inner().id(color_texture, depth_texture)
         }
 
-        fn fragment_attributes(&self) -> FragmentAttributes {
-            self.$inner().fragment_attributes()
-        }
-
         fn use_uniforms(
             &self,
             program: &Program,
@@ -96,12 +92,6 @@ pub trait Effect {
         depth_texture: Option<DepthTexture>,
     ) -> EffectMaterialId;
 
-    ///
-    /// Returns a [FragmentAttributes] struct that describes which fragment attributes,
-    /// ie. the input from the vertex shader, are required for rendering with this effect.
-    ///
-    fn fragment_attributes(&self) -> FragmentAttributes;
-
     ///
     /// Sends the uniform data needed for this effect to the fragment shader.
     ///
@@ -164,10 +154,6 @@ impl<T: Effect> Effect for std::sync::RwLock<T> {
         self.read().unwrap().id(color_texture, depth_texture)
     }
 
-    fn fragment_attributes(&self) -> FragmentAttributes {
-        self.read().unwrap().fragment_attributes()
-    }
-
     fn use_uniforms(
         &self,
         program: &Program,

diff --git a/src/renderer/effect/copy.rs b/src/renderer/effect/copy.rs
@@ -57,13 +57,6 @@ impl Effect for CopyEffect {
         EffectMaterialId::CopyEffect(color_texture, depth_texture)
     }
 
-    fn fragment_attributes(&self) -> FragmentAttributes {
-        FragmentAttributes {
-            uv: true,
-            ..FragmentAttributes::NONE
-        }
-    }
-
     fn use_uniforms(
         &self,
         program: &Program,

diff --git a/src/renderer/effect/fog.rs b/src/renderer/effect/fog.rs
@@ -59,13 +59,6 @@ impl Effect for FogEffect {
         )
     }
 
-    fn fragment_attributes(&self) -> FragmentAttributes {
-        FragmentAttributes {
-            uv: true,
-            ..FragmentAttributes::NONE
-        }
-    }
-
     fn use_uniforms(
         &self,
         program: &Program,

diff --git a/src/renderer/effect/full_screen.rs b/src/renderer/effect/full_screen.rs
@@ -61,13 +61,6 @@ impl Effect for ScreenEffect {
         EffectMaterialId::ScreenEffect(color_texture, depth_texture)
     }
 
-    fn fragment_attributes(&self) -> FragmentAttributes {
-        FragmentAttributes {
-            uv: true,
-            ..FragmentAttributes::NONE
-        }
-    }
-
     fn use_uniforms(
         &self,
         program: &Program,

diff --git a/src/renderer/effect/fxaa.rs b/src/renderer/effect/fxaa.rs
@@ -33,13 +33,6 @@ impl Effect for FxaaEffect {
         )
     }
 
-    fn fragment_attributes(&self) -> FragmentAttributes {
-        FragmentAttributes {
-            uv: true,
-            ..FragmentAttributes::NONE
-        }
-    }
-
     fn use_uniforms(
         &self,
         program: &Program,

diff --git a/src/renderer/effect/lighting_pass.rs b/src/renderer/effect/lighting_pass.rs
@@ -32,13 +32,6 @@ impl Effect for LightingPassEffect {
         EffectMaterialId::LightingPassEffect(color_texture.unwrap(), depth_texture.unwrap())
     }
 
-    fn fragment_attributes(&self) -> FragmentAttributes {
-        FragmentAttributes {
-            uv: true,
-            ..FragmentAttributes::NONE
-        }
-    }
-
     fn use_uniforms(
         &self,
         program: &Program,

diff --git a/src/renderer/effect/water.rs b/src/renderer/effect/water.rs
@@ -70,15 +70,6 @@ impl Effect for WaterEffect {
         )
     }
 
-    fn fragment_attributes(&self) -> FragmentAttributes {
-        FragmentAttributes {
-            position: true,
-            normal: true,
-            uv: true,
-            ..FragmentAttributes::NONE
-        }
-    }
-
     fn render_states(&self) -> RenderStates {
         RenderStates {
             blend: Blend::TRANSPARENCY,