diff options
| author | Tadeo hepperle <tadeo@do-mix.de> | 2024-06-26 19:31:00 +0200 |
|---|---|---|
| committer | Tadeo hepperle <tadeo@do-mix.de> | 2024-06-26 19:31:00 +0200 |
| commit | 67e69f719648704c9fa118dcc7cb052d8ab30608 (patch) | |
| tree | d28d893b51ba0796d41bd4fe6b86133cd3c0eb40 /base/runtime | |
| parent | 18dadd94e3a91d1eed5938f4998b8b7a71765afb (diff) | |
| parent | 8d1827838fb902be4f16b3b028ac0d299a456857 (diff) | |
Merge branch 'master' into fix-vulkan-codegen-arrays-as-proc-args
Diffstat (limited to 'base/runtime')
| -rw-r--r-- | base/runtime/heap_allocator.odin | 6 | ||||
| -rw-r--r-- | base/runtime/heap_allocator_orca.odin | 6 | ||||
| -rw-r--r-- | base/runtime/heap_allocator_other.odin | 6 | ||||
| -rw-r--r-- | base/runtime/heap_allocator_unix.odin | 6 | ||||
| -rw-r--r-- | base/runtime/heap_allocator_windows.odin | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/base/runtime/heap_allocator.odin b/base/runtime/heap_allocator.odin index 75f79ab77..cdad8690e 100644 --- a/base/runtime/heap_allocator.odin +++ b/base/runtime/heap_allocator.odin @@ -97,14 +97,14 @@ heap_allocator_proc :: proc(allocator_data: rawptr, mode: Allocator_Mode, } -heap_alloc :: proc(size: int, zero_memory := true) -> rawptr { +heap_alloc :: proc "contextless" (size: int, zero_memory := true) -> rawptr { return _heap_alloc(size, zero_memory) } -heap_resize :: proc(ptr: rawptr, new_size: int) -> rawptr { +heap_resize :: proc "contextless" (ptr: rawptr, new_size: int) -> rawptr { return _heap_resize(ptr, new_size) } -heap_free :: proc(ptr: rawptr) { +heap_free :: proc "contextless" (ptr: rawptr) { _heap_free(ptr) }
\ No newline at end of file diff --git a/base/runtime/heap_allocator_orca.odin b/base/runtime/heap_allocator_orca.odin index c22a67ca1..9e719bcd0 100644 --- a/base/runtime/heap_allocator_orca.odin +++ b/base/runtime/heap_allocator_orca.odin @@ -9,7 +9,7 @@ foreign { @(link_name="realloc") _orca_realloc :: proc "c" (ptr: rawptr, size: int) -> rawptr --- } -_heap_alloc :: proc(size: int, zero_memory := true) -> rawptr { +_heap_alloc :: proc "contextless" (size: int, zero_memory := true) -> rawptr { if size <= 0 { return nil } @@ -20,10 +20,10 @@ _heap_alloc :: proc(size: int, zero_memory := true) -> rawptr { } } -_heap_resize :: proc(ptr: rawptr, new_size: int) -> rawptr { +_heap_resize :: proc "contextless" (ptr: rawptr, new_size: int) -> rawptr { return _orca_realloc(ptr, new_size) } -_heap_free :: proc(ptr: rawptr) { +_heap_free :: proc "contextless" (ptr: rawptr) { _orca_free(ptr) } diff --git a/base/runtime/heap_allocator_other.odin b/base/runtime/heap_allocator_other.odin index 74536ada9..d387aada2 100644 --- a/base/runtime/heap_allocator_other.odin +++ b/base/runtime/heap_allocator_other.odin @@ -2,14 +2,14 @@ //+private package runtime -_heap_alloc :: proc(size: int, zero_memory := true) -> rawptr { +_heap_alloc :: proc "contextless" (size: int, zero_memory := true) -> rawptr { unimplemented("base:runtime 'heap_alloc' procedure is not supported on this platform") } -_heap_resize :: proc(ptr: rawptr, new_size: int) -> rawptr { +_heap_resize :: proc "contextless" (ptr: rawptr, new_size: int) -> rawptr { unimplemented("base:runtime 'heap_resize' procedure is not supported on this platform") } -_heap_free :: proc(ptr: rawptr) { +_heap_free :: proc "contextless" (ptr: rawptr) { unimplemented("base:runtime 'heap_free' procedure is not supported on this platform") } diff --git a/base/runtime/heap_allocator_unix.odin b/base/runtime/heap_allocator_unix.odin index a8a4e9169..60af9e761 100644 --- a/base/runtime/heap_allocator_unix.odin +++ b/base/runtime/heap_allocator_unix.odin @@ -16,7 +16,7 @@ foreign libc { @(link_name="realloc") _unix_realloc :: proc(ptr: rawptr, size: int) -> rawptr --- } -_heap_alloc :: proc(size: int, zero_memory := true) -> rawptr { +_heap_alloc :: proc "contextless" (size: int, zero_memory := true) -> rawptr { if size <= 0 { return nil } @@ -27,12 +27,12 @@ _heap_alloc :: proc(size: int, zero_memory := true) -> rawptr { } } -_heap_resize :: proc(ptr: rawptr, new_size: int) -> rawptr { +_heap_resize :: proc "contextless" (ptr: rawptr, new_size: int) -> rawptr { // NOTE: _unix_realloc doesn't guarantee new memory will be zeroed on // POSIX platforms. Ensure your caller takes this into account. return _unix_realloc(ptr, new_size) } -_heap_free :: proc(ptr: rawptr) { +_heap_free :: proc "contextless" (ptr: rawptr) { _unix_free(ptr) } diff --git a/base/runtime/heap_allocator_windows.odin b/base/runtime/heap_allocator_windows.odin index 2097c3671..e07df7559 100644 --- a/base/runtime/heap_allocator_windows.odin +++ b/base/runtime/heap_allocator_windows.odin @@ -14,11 +14,11 @@ foreign kernel32 { HeapFree :: proc(hHeap: rawptr, dwFlags: u32, lpMem: rawptr) -> b32 --- } -_heap_alloc :: proc(size: int, zero_memory := true) -> rawptr { +_heap_alloc :: proc "contextless" (size: int, zero_memory := true) -> rawptr { HEAP_ZERO_MEMORY :: 0x00000008 return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY if zero_memory else 0, uint(size)) } -_heap_resize :: proc(ptr: rawptr, new_size: int) -> rawptr { +_heap_resize :: proc "contextless" (ptr: rawptr, new_size: int) -> rawptr { if new_size == 0 { _heap_free(ptr) return nil @@ -30,7 +30,7 @@ _heap_resize :: proc(ptr: rawptr, new_size: int) -> rawptr { HEAP_ZERO_MEMORY :: 0x00000008 return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ptr, uint(new_size)) } -_heap_free :: proc(ptr: rawptr) { +_heap_free :: proc "contextless" (ptr: rawptr) { if ptr == nil { return } |