allemang.d/vulkan-zig
1
0
Fork 0
forked from mirror/vulkan-zig
Code Pull Requests Activity

Adapt ProfilingAllocator to new allocator interface

Browse Source
This commit is contained in:
Robin Voetter
2020-06-28 01:41:53 +02:00
parent bf0c4713d2
commit 45fa195eab
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
generator/main.zig
View File

@@ -76,8 +76,8 @@ const ProfilingAllocator = struct {
fn init(parent_allocator: *Allocator) ProfilingAllocator { fn init(parent_allocator: *Allocator) ProfilingAllocator {
return ProfilingAllocator{ return ProfilingAllocator{
.allocator = Allocator{ .allocator = Allocator{
.reallocFn = realloc, .allocFn = alloc,
.shrinkFn = shrink, .resizeFn = resize,
}, },
.parent_allocator = parent_allocator, .parent_allocator = parent_allocator,
.max_usage = 0, .max_usage = 0,
@@ -85,19 +85,26 @@ const ProfilingAllocator = struct {
}; };
} }
fn realloc(allocator: *Allocator, old_mem: []u8, old_align: u29, new_size: usize, new_align: u29) ![]u8 { fn alloc(allocator: *Allocator, len: usize, ptr_align: u29, len_align: u29) ![]u8 {
const self = @fieldParentPtr(ProfilingAllocator, "allocator", allocator); const self = @fieldParentPtr(ProfilingAllocator, "allocator", allocator);
self.current_usage = self.current_usage - old_mem.len + new_size; const buf = try self.parent_allocator.allocFn(self.parent_allocator, len, ptr_align, len_align);
self.current_usage += buf.len;
if (self.current_usage > self.max_usage) { if (self.current_usage > self.max_usage) {
self.max_usage = self.current_usage; self.max_usage = self.current_usage;
} }
return self.parent_allocator.reallocFn(self.parent_allocator, old_mem, old_align, new_size, new_align); return buf;
} }
fn shrink(allocator: *Allocator, old_mem: []u8, old_align: u29, new_size: usize, new_align: u29) []u8 { fn resize(allocator: *Allocator, buf: []u8, new_len: usize, len_align: u29) !usize {
const self = @fieldParentPtr(ProfilingAllocator, "allocator", allocator); const self = @fieldParentPtr(ProfilingAllocator, "allocator", allocator);
return self.parent_allocator.shrinkFn(self.parent_allocator, old_mem, old_align, new_size, new_align); const actual_new_len = try self.parent_allocator.resizeFn(self.parent_allocator, buf, new_len, len_align);
self.current_usage = self.current_usage - buf.len + actual_new_len;
if (self.current_usage > self.max_usage) {
self.max_usage = self.current_usage;
}
return actual_new_len;
} }
}; };