diff options
| author | Chia-I Wu <olv@lunarg.com> | 2015-10-31 00:31:16 +0800 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-11-03 15:19:07 -0700 |
| commit | 95a799dee5d15cff133af1956c77211194197a82 (patch) | |
| tree | 51e8443fd567573d23c22082d6d71998615af6b5 /loader | |
| parent | 0e76e3fd433cc1e36428296deb09910ca9dc17c7 (diff) | |
| download | usermoji-95a799dee5d15cff133af1956c77211194197a82.tar.xz | |
bug 12921 part 2: Memory callback (WIP)
Minor cleanups.
s/VK_SYSTEM_ALLOCATION_SCOPE_FUNCTION/VK_SYSTEM_ALLOCATION_SCOPE_COMMAND/g
https://cvs.khronos.org/bugzilla/show_bug.cgi?id=12921
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/loader.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/loader/loader.c b/loader/loader.c index 94aff594..1437e8a6 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -167,7 +167,7 @@ void* loader_heap_realloc( void *loader_tls_heap_alloc(size_t size) { - return loader_heap_alloc(tls_instance, size, VK_SYSTEM_ALLOCATION_SCOPE_FUNCTION); + return loader_heap_alloc(tls_instance, size, VK_SYSTEM_ALLOCATION_SCOPE_COMMAND); } void loader_tls_heap_free(void *pMemory) @@ -1806,14 +1806,14 @@ static void loader_get_manifest_files(const struct loader_instance *inst, if (out_files->count == 0) { out_files->filename_list = loader_heap_alloc(inst, alloced_count * sizeof(char *), - VK_SYSTEM_ALLOCATION_SCOPE_FUNCTION); + VK_SYSTEM_ALLOCATION_SCOPE_COMMAND); } else if (out_files->count == alloced_count) { out_files->filename_list = loader_heap_realloc(inst, out_files->filename_list, alloced_count * sizeof(char *), alloced_count * sizeof(char *) * 2, - VK_SYSTEM_ALLOCATION_SCOPE_FUNCTION); + VK_SYSTEM_ALLOCATION_SCOPE_COMMAND); alloced_count *= 2; } if (out_files->filename_list == NULL) { @@ -1823,7 +1823,7 @@ static void loader_get_manifest_files(const struct loader_instance *inst, out_files->filename_list[out_files->count] = loader_heap_alloc( inst, strlen(name) + 1, - VK_SYSTEM_ALLOCATION_SCOPE_FUNCTION); + VK_SYSTEM_ALLOCATION_SCOPE_COMMAND); if (out_files->filename_list[out_files->count] == NULL) { loader_log(VK_DBG_REPORT_ERROR_BIT, 0, "Out of memory can't get manifest files"); return; |