Fix leaking textures

david-vanderson · Dec 31, 2024 · ef5c92f · ef5c92f · david-vanderson · Jan 2, 2025
1 parent 6bedaf8
commit ef5c92f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,3 @@ zig-cache
 .zig-cache
 zig-out
 *.swp
-sdl_files
diff --git a/src/dvui.zig b/src/dvui.zig
@@ -245,10 +245,11 @@ const FontCacheEntry = struct {
     texture_atlas_size: Size,
     texture_atlas_regen: bool,
 
-    pub fn deinit(self: *FontCacheEntry) void {
+    pub fn deinit(self: *FontCacheEntry, win: *Window) void {
         if (useFreeType) {
             _ = c.FT_Done_Face(self.face);
         }
+        win.backend.textureDestroy(self.texture_atlas);
     }
 
     pub const OpenFlags = packed struct(c_int) {
@@ -624,10 +625,13 @@ pub fn fontCacheGet(font: Font) !*FontCacheEntry {
             .texture_atlas_regen = true,
         };
     }
-
     //log.debug("- size {d} ascent {d} height {d}", .{ font.size, entry.ascent, entry.height });
 
-    try cw.font_cache.put(fontHash, entry);
+    errdefer {
+        std.debug.assert(false);
+        textureDestroyLater(entry.texture_atlas);
+    }
+    try cw.font_cache.putNoClobber(fontHash, entry);
 
     return cw.font_cache.getPtr(fontHash).?;
 }
@@ -2829,7 +2833,7 @@ pub const Window = struct {
             var it = self.font_cache.iterator();
             while (it.next()) |item| {
                 item.value_ptr.glyph_info.deinit();
-                item.value_ptr.deinit();
+                item.value_ptr.deinit(self);
             }
             self.font_cache.deinit();
         }
@@ -3454,7 +3458,7 @@ pub const Window = struct {
             for (deadFonts.items) |id| {
                 var tce = self.font_cache.fetchRemove(id).?;
                 tce.value.glyph_info.deinit();
-                tce.value.deinit();
+                tce.value.deinit(self);
             }
 
             //std.debug.print("font_cache {d}\n", .{self.font_cache.count()});
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,4 +3,3 @@ zig-cache @@
     .zig-cache
     zig-out
     *.swp
-    sdl_files