diff options
| author | DanielGavin <danielgavin5@hotmail.com> | 2024-01-19 18:07:57 +0100 |
|---|---|---|
| committer | DanielGavin <danielgavin5@hotmail.com> | 2024-01-19 18:07:57 +0100 |
| commit | 4e7714ec85b7067d6c0ede25c4c66c7517210bc9 (patch) | |
| tree | 98a8a58fbf2b7e6f899b4f540ab0e2f6c9fdc62e /src | |
| parent | d36a12d355b363a6071a585996f02cf730d12692 (diff) | |
| parent | 222b8aae0f78210939013ed1592b63b7300636a1 (diff) | |
Merge branch 'master' into poly
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/allocator.odin | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/common/allocator.odin b/src/common/allocator.odin index 2f4f784..21499a1 100644 --- a/src/common/allocator.odin +++ b/src/common/allocator.odin @@ -43,8 +43,7 @@ scratch_allocator_destroy :: proc(s: ^Scratch_Allocator) { scratch_allocator_proc :: proc(
allocator_data: rawptr,
mode: mem.Allocator_Mode,
- size,
- alignment: int,
+ size, alignment: int,
old_memory: rawptr,
old_size: int,
loc := #caller_location,
@@ -121,7 +120,7 @@ scratch_allocator_proc :: proc( }
clear(&s.leaked_allocations)
- case .Resize:
+ case .Resize, .Resize_Non_Zeroed:
begin := uintptr(raw_data(s.data))
end := begin + uintptr(len(s.data))
old_ptr := uintptr(old_memory)
|