Merge branch 'optimize_damage_tracking' into 'master'

graphics/console-draw: Collapse consecutive damage entries See merge request redox-os/drivers!226
2024-12-28 22:45:04 +00:00
parent d7c98a877a 5bfce514be
commit dcef51fc60
1 changed files with 15 additions and 10 deletions
@@ -213,16 +213,21 @@ impl TextScreen {
        }

        let width = map.width.try_into().unwrap();
-        let damage = self
-            .changed
-            .iter()
-            .map(|&change| Damage {
-                x: 0,
-                y: i32::try_from(change).unwrap() * 16,
-                width,
-                height: 16,
-            })
-            .collect();
+        let mut damage: Vec<Damage> = vec![];
+        let mut last_change = usize::MAX - 1;
+        for &change in &self.changed {
+            if change == last_change + 1 {
+                damage.last_mut().unwrap().height += 16;
+            } else {
+                damage.push(Damage {
+                    x: 0,
+                    y: i32::try_from(change).unwrap() * 16,
+                    width,
+                    height: 16,
+                });
+            }
+            last_change = change;
+        }

        self.changed.clear();