Compare commits

...

2 Commits

Author SHA1 Message Date
michael-oberpriller
6b7d5cf3d8 Conditional to non-android 2023-09-25 15:11:49 -05:00
Michael Oberpriller
16a6a67e34 Revert "host_memory: Allocate virtual_base with MAP_NORESERVE"
This reverts commit 4d7be85e73.

Fix VK_ERROR_OUT_OF_DEVICE_MEMORY
2023-09-22 09:33:09 -05:00

View File

@@ -414,7 +414,7 @@ public:
throw std::bad_alloc{};
}
}
#else
#elif defined(ANDROID)
virtual_base = static_cast<u8*>(mmap(nullptr, virtual_size, PROT_NONE,
MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0));
if (virtual_base == MAP_FAILED) {
@@ -422,6 +422,14 @@ public:
throw std::bad_alloc{};
}
madvise(virtual_base, virtual_size, MADV_HUGEPAGE);
#else
virtual_base = static_cast<u8*>(mmap(nullptr, virtual_size, PROT_NONE,
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0));
if (virtual_base == MAP_FAILED) {
LOG_CRITICAL(HW_Memory, "mmap failed: {}", strerror(errno));
throw std::bad_alloc{};
}
madvise(virtual_base, virtual_size, MADV_HUGEPAGE);
#endif
placeholders.add({0, virtual_size});