diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2020-12-25 14:58:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-25 14:58:40 +0100 |
| commit | ecffa43335bc26990992784405076732d531bd15 (patch) | |
| tree | 4fe7eaa2d2490b9dcdf94ce3e15dc45cae9f6718 /core/templates | |
| parent | af2232521c39fec402d08c622dc726b6600f7f12 (diff) | |
| parent | 2e66e5d5992a521fe27dc88fee92c680f4adf98b (diff) | |
Merge pull request #44662 from reduz/bvh-use-page-allocator
Use page allocator for BVH
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/paged_allocator.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/templates/paged_allocator.h b/core/templates/paged_allocator.h index 8bd1eecdeb..ab9945dd3b 100644 --- a/core/templates/paged_allocator.h +++ b/core/templates/paged_allocator.h @@ -108,7 +108,7 @@ public: return page_size > 0; } - void configure(uint32_t p_page_size, bool p_thread_safe) { + void configure(uint32_t p_page_size) { ERR_FAIL_COND(page_pool != nullptr); //sanity check ERR_FAIL_COND(p_page_size == 0); page_size = nearest_power_of_2_templated(p_page_size); @@ -116,8 +116,8 @@ public: page_shift = get_shift_from_power_of_2(page_size); } - PagedAllocator(uint32_t p_page_size = 4096, bool p_thread_safe = false) { // power of 2 recommended because of alignment with OS page sizes. Even if element is bigger, its still a multiple and get rounded amount of pages - configure(p_page_size, false); + PagedAllocator(uint32_t p_page_size = 4096) { // power of 2 recommended because of alignment with OS page sizes. Even if element is bigger, its still a multiple and get rounded amount of pages + configure(p_page_size); } ~PagedAllocator() { |