This commit is contained in:
gingerBill
2021-08-07 15:07:29 +01:00
parent 16eeae36d7
commit 423b842347
2 changed files with 12 additions and 12 deletions
+6 -6
View File
@@ -173,7 +173,7 @@ GB_ALLOCATOR_PROC(heap_allocator_proc) {
} break;
case gbAllocation_Resize:
if (new_size == 0) {
if (size == 0) {
free(old_memory);
break;
}
@@ -182,14 +182,14 @@ GB_ALLOCATOR_PROC(heap_allocator_proc) {
gb_zero_size(ptr, size);
break;
}
if (new_size <= old_size) {
if (size <= old_size) {
ptr = old_memory;
break;
}
ptr = aligned_alloc(alignment, (size + alignment - 1) & ~(alignment - 1));
gb_memmove(ptr, old_memory, old_size);
gb_zero_size(cast(u8 *)ptr + old_size, gb_max(new_size-old_size, 0));
gb_zero_size(cast(u8 *)ptr + old_size, gb_max(size-old_size, 0));
break;
#else
// TODO(bill): *nix version that's decent
@@ -203,7 +203,7 @@ GB_ALLOCATOR_PROC(heap_allocator_proc) {
break;
case gbAllocation_Resize:
if (new_size == 0) {
if (size == 0) {
free(old_memory);
break;
}
@@ -212,14 +212,14 @@ GB_ALLOCATOR_PROC(heap_allocator_proc) {
gb_zero_size(ptr, size);
break;
}
if (new_size <= old_size) {
if (size <= old_size) {
ptr = old_memory;
break;
}
posix_memalign(&ptr, alignment, size);
gb_memmove(ptr, old_memory, old_size);
gb_zero_size(cast(u8 *)ptr + old_size, gb_max(new_size-old_size, 0));
gb_zero_size(cast(u8 *)ptr + old_size, gb_max(size-old_size, 0));
break;
#endif