Merge branch 'zig-gamedev:main' into string-literals

Author: jhark

src/ztracy.zig

@@ -560,6 +560,7 @@ const tracy_full = struct {
                 .vtable = &.{
                     .alloc = alloc,
                     .resize = resize,
+                    .remap = remap,
                     .free = free,
                 },
             };
@@ -568,11 +569,11 @@ const tracy_full = struct {
         fn alloc(
             ctx: *anyopaque,
             len: usize,
-            log2_ptr_align: u8,
+            alignment: std.mem.Alignment,
             ra: usize,
         ) ?[*]u8 {
             const self: *TracyAllocator = @ptrCast(@alignCast(ctx));
-            const result = self.child_allocator.rawAlloc(len, log2_ptr_align, ra);
+            const result = self.child_allocator.rawAlloc(len, alignment, ra);
             if (result) |addr| {
                 Alloc(addr, len);
             } else {
@@ -586,12 +587,12 @@ const tracy_full = struct {
         fn resize(
             ctx: *anyopaque,
             buf: []u8,
-            log2_ptr_align: u8,
+            alignment: std.mem.Alignment,
             new_len: usize,
             ra: usize,
         ) bool {
             const self: *TracyAllocator = @ptrCast(@alignCast(ctx));
-            const result = self.child_allocator.rawResize(buf, log2_ptr_align, new_len, ra);
+            const result = self.child_allocator.rawResize(buf, alignment, new_len, ra);
             if (result) {
                 Free(buf.ptr);
                 Alloc(buf.ptr, new_len);
@@ -603,14 +604,34 @@ const tracy_full = struct {
             return result;
         }
 
+        fn remap(
+            ctx: *anyopaque,
+            buf: []u8,
+            alignment: std.mem.Alignment,
+            new_len: usize,
+            ra: usize,
+        ) ?[*]u8 {
+            const self: *TracyAllocator = @ptrCast(@alignCast(ctx));
+            const result = self.child_allocator.rawRemap(buf, alignment, new_len, ra);
+            if (result) |data| {
+                Free(buf.ptr);
+                Alloc(data, new_len);
+            } else {
+                var buffer: [128]u8 = undefined;
+                const msg = std.fmt.bufPrint(&buffer, "remap failed requesting {d} -> {d}", .{ buf.len, new_len }) catch return result;
+                Message(msg);
+            }
+            return result;
+        }
+
         fn free(
             ctx: *anyopaque,
             buf: []u8,
-            log2_ptr_align: u8,
+            alignment: std.mem.Alignment,
             ra: usize,
         ) void {
             const self: *TracyAllocator = @ptrCast(@alignCast(ctx));
-            self.child_allocator.rawFree(buf, log2_ptr_align, ra);
+            self.child_allocator.rawFree(buf, alignment, ra);
             Free(buf.ptr);
         }
     };