Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

[common/virtual_buffer] Fix Windows on Snapdragon 7C realizing virtual pages before they're needed (#4128)

lizzie6bdb03d8ac5a
diff --git a/src/common/virtual_buffer.cpp b/src/common/virtual_buffer.cpp
index 55ddfc243a..8a4265e3e6 100644
--- a/src/common/virtual_buffer.cpp
+++ b/src/common/virtual_buffer.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
@@ -17,7 +17,11 @@ namespace Common {
void* AllocateMemoryPages(std::size_t size) noexcept {
#ifdef _WIN32
- void* base = VirtualAlloc(nullptr, size, MEM_COMMIT, PAGE_READWRITE);
+ void* base = VirtualAlloc(nullptr, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
+ if (base == nullptr) {
+ // Probably failing to reserve is less likely than failing to commit
+ base = VirtualAlloc(nullptr, size, MEM_COMMIT, PAGE_READWRITE);
+ }
#else
void* base = mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0);
if (base == MAP_FAILED)