Compare commits
30 commits
214637ced8
...
7bfa16bf0d
Author | SHA1 | Date | |
---|---|---|---|
7bfa16bf0d | |||
17933b15c7 | |||
c030cd7cf5 | |||
b7944e2bcf | |||
189b1a1850 | |||
22ec37db75 | |||
3b95c20a2a | |||
37386890d8 | |||
b47cbefa11 | |||
560b93a8de | |||
bcd24f3545 | |||
ea842bb334 | |||
a2471f0def | |||
4d1bee40b4 | |||
57e9f4a32d | |||
683c574c33 | |||
7c547daca5 | |||
4f2b63d544 | |||
d2661e6ba1 | |||
9a5c139aa3 | |||
a21dc51fa6 | |||
cbad41aeb7 | |||
3f62a50b17 | |||
1723a5950f | |||
a190e1d673 | |||
a0e47b816b | |||
725407b989 | |||
6510818fca | |||
a487cea683 | |||
a3c0d59dc9 |
21 changed files with 66 additions and 56 deletions
|
@ -10,17 +10,18 @@
|
|||
/.ci @crueter
|
||||
|
||||
# cmake
|
||||
*.cmake @crueter
|
||||
*/CMakeLists.txt @crueter
|
||||
*.in @crueter
|
||||
*.cmake @crueter
|
||||
*CMakeLists.txt @crueter
|
||||
*.in @crueter
|
||||
|
||||
# individual stuff
|
||||
/src/web_service @AleksandrPopovich
|
||||
/src/dynarmic @Lizzie
|
||||
/src/core @Lizzie @Maufeat @PavelBARABANOV @MrPurple666
|
||||
/src/core/hle @Maufeat @PavelBARABANOV @SDK-Chan
|
||||
/src/*_room @AleksandrPopovich
|
||||
/src/video_core @CamilleLaVey @MaranBr @Wildcard @weakboson
|
||||
src/web_service @AleksandrPopovich
|
||||
src/dynarmic @Lizzie
|
||||
src/core @Lizzie @Maufeat @PavelBARABANOV @MrPurple666 @JPikachu
|
||||
src/core/hle @Maufeat @PavelBARABANOV @SDK-Chan
|
||||
src/core/arm @Lizzie @MrPurple666
|
||||
src/*_room @AleksandrPopovich
|
||||
src/video_core @CamilleLaVey @MaranBr @Wildcard @weakboson
|
||||
|
||||
# Global owners/triage
|
||||
* @CamilleLaVey @Maufeat @crueter @MrPurple666 @MaranBr @Lizzie
|
|
@ -836,13 +836,13 @@
|
|||
<string name="ratio_stretch">تمتد إلى النافذة</string>
|
||||
|
||||
<!-- CPU Backend -->
|
||||
<string name="cpu_backend_dynarmic">Dynarmic (بطيء)</string>
|
||||
<string name="cpu_backend_dynarmic">Dynarmic (JIT)</string>
|
||||
<string name="cpu_backend_nce">تنفيذ التعليمات البرمجية الأصلية (NCE)</string>
|
||||
|
||||
<!-- CPU Accuracy -->
|
||||
<string name="cpu_accuracy_accurate">دقه</string>
|
||||
<string name="cpu_accuracy_unsafe">غير آمن</string>
|
||||
<string name="cpu_accuracy_paranoid">Paranoid (بطيء)</string>
|
||||
<string name="cpu_accuracy_paranoid">Paranoid</string>
|
||||
|
||||
<!-- Gamepad Buttons -->
|
||||
<string name="gamepad_d_pad">الأسهم</string>
|
||||
|
|
|
@ -919,13 +919,13 @@
|
|||
<string name="ratio_stretch">Ajustar a la ventana</string>
|
||||
|
||||
<!-- CPU Backend -->
|
||||
<string name="cpu_backend_dynarmic">DynARMic (lento)</string>
|
||||
<string name="cpu_backend_dynarmic">Dynarmic (JIT)</string>
|
||||
<string name="cpu_backend_nce">Ejecución nativa de código (NCE)</string>
|
||||
|
||||
<!-- CPU Accuracy -->
|
||||
<string name="cpu_accuracy_accurate">Preciso</string>
|
||||
<string name="cpu_accuracy_unsafe">Impreciso</string>
|
||||
<string name="cpu_accuracy_paranoid">Paranoico (Lento)</string>
|
||||
<string name="cpu_accuracy_paranoid">Paranoico</string>
|
||||
|
||||
<!-- Gamepad Buttons -->
|
||||
<string name="gamepad_d_pad">Cruceta</string>
|
||||
|
|
|
@ -918,13 +918,13 @@
|
|||
<string name="ratio_stretch">کشش تا پر کردن پنجره</string>
|
||||
|
||||
<!-- CPU Backend -->
|
||||
<string name="cpu_backend_dynarmic">دینارمیک (کند)</string>
|
||||
<string name="cpu_backend_dynarmic">Dynarmic (JIT)</string>
|
||||
<string name="cpu_backend_nce">اجرای کد اصلی (NCE)</string>
|
||||
|
||||
<!-- CPU Accuracy -->
|
||||
<string name="cpu_accuracy_accurate">دقیق</string>
|
||||
<string name="cpu_accuracy_unsafe">ناامن</string>
|
||||
<string name="cpu_accuracy_paranoid">بدگمان (کند)</string>
|
||||
<string name="cpu_accuracy_paranoid">بدگمان</string>
|
||||
|
||||
<!-- Gamepad Buttons -->
|
||||
<string name="gamepad_d_pad">کلیدهای جهتی</string>
|
||||
|
|
|
@ -967,13 +967,13 @@
|
|||
<string name="ratio_stretch">Étirer à la fenêtre</string>
|
||||
|
||||
<!-- CPU Backend -->
|
||||
<string name="cpu_backend_dynarmic">Dynarmic (Lent)</string>
|
||||
<string name="cpu_backend_dynarmic">Dynarmic (JIT)</string>
|
||||
<string name="cpu_backend_nce">Exécution de code natif (NCE)</string>
|
||||
|
||||
<!-- CPU Accuracy -->
|
||||
<string name="cpu_accuracy_accurate">Précis</string>
|
||||
<string name="cpu_accuracy_unsafe">Risqué</string>
|
||||
<string name="cpu_accuracy_paranoid">Paranoïaque (Lent)</string>
|
||||
<string name="cpu_accuracy_paranoid">Paranoïaque</string>
|
||||
|
||||
<!-- Gamepad Buttons -->
|
||||
<string name="gamepad_d_pad">Pavé directionnel</string>
|
||||
|
|
|
@ -844,13 +844,13 @@
|
|||
<string name="ratio_stretch">הרחב לגודל המסך</string>
|
||||
|
||||
<!-- CPU Backend -->
|
||||
<string name="cpu_backend_dynarmic">דינמי (איטי)</string>
|
||||
<string name="cpu_backend_dynarmic">דינמי</string>
|
||||
<string name="cpu_backend_nce">ביצוע קוד מקורי (NCE)</string>
|
||||
|
||||
<!-- CPU Accuracy -->
|
||||
<string name="cpu_accuracy_accurate">מדויק</string>
|
||||
<string name="cpu_accuracy_unsafe">לא בטוח</string>
|
||||
<string name="cpu_accuracy_paranoid">פראנואידי (איטי)</string>
|
||||
<string name="cpu_accuracy_paranoid">פראנואידי</string>
|
||||
|
||||
<!-- Gamepad Buttons -->
|
||||
<string name="gamepad_d_pad">D-pad</string>
|
||||
|
|
|
@ -954,13 +954,13 @@
|
|||
<string name="ratio_stretch">Ablakhoz nyújtás</string>
|
||||
|
||||
<!-- CPU Backend -->
|
||||
<string name="cpu_backend_dynarmic">Dinamikus (lassú)</string>
|
||||
<string name="cpu_backend_dynarmic">Dynarmic (JIT)</string>
|
||||
<string name="cpu_backend_nce">Natív kód végrehajtás (Native code execution (NCE))</string>
|
||||
|
||||
<!-- CPU Accuracy -->
|
||||
<string name="cpu_accuracy_accurate">Pontos</string>
|
||||
<string name="cpu_accuracy_unsafe">Nem biztonságos</string>
|
||||
<string name="cpu_accuracy_paranoid">Paranoid (Lassú)</string>
|
||||
<string name="cpu_accuracy_paranoid">Paranoid</string>
|
||||
|
||||
<!-- Gamepad Buttons -->
|
||||
<string name="gamepad_d_pad">D-pad</string>
|
||||
|
|
|
@ -911,13 +911,13 @@
|
|||
<string name="ratio_stretch">Merentangkan</string>
|
||||
|
||||
<!-- CPU Backend -->
|
||||
<string name="cpu_backend_dynarmic">Dynamic (Lambat)</string>
|
||||
<string name="cpu_backend_dynarmic">Dynarmic (JIT)</string>
|
||||
<string name="cpu_backend_nce">Native code execution (NCE)</string>
|
||||
|
||||
<!-- CPU Accuracy -->
|
||||
<string name="cpu_accuracy_accurate">Akurat</string>
|
||||
<string name="cpu_accuracy_unsafe">Berbahaya</string>
|
||||
<string name="cpu_accuracy_paranoid">Paranoid (Slow)</string>
|
||||
<string name="cpu_accuracy_paranoid">Paranoid</string>
|
||||
|
||||
<!-- Gamepad Buttons -->
|
||||
<string name="gamepad_d_pad">D Pad</string>
|
||||
|
|
|
@ -834,13 +834,13 @@
|
|||
<string name="ratio_stretch">画面に合わせる</string>
|
||||
|
||||
<!-- CPU Backend -->
|
||||
<string name="cpu_backend_dynarmic">Dynarmic (低速)</string>
|
||||
<string name="cpu_backend_dynarmic">Dynarmic (JIT)</string>
|
||||
<string name="cpu_backend_nce">ネイティブコード実行 (NCE)</string>
|
||||
|
||||
<!-- CPU Accuracy -->
|
||||
<string name="cpu_accuracy_accurate">正確</string>
|
||||
<string name="cpu_accuracy_unsafe">不安定</string>
|
||||
<string name="cpu_accuracy_paranoid">パラノイド (低速)</string>
|
||||
<string name="cpu_accuracy_paranoid">パラノイド</string>
|
||||
|
||||
<!-- Gamepad Buttons -->
|
||||
<string name="gamepad_d_pad">方向ボタン</string>
|
||||
|
|
|
@ -910,13 +910,13 @@
|
|||
<string name="ratio_stretch">화면에 맞춤</string>
|
||||
|
||||
<!-- CPU Backend -->
|
||||
<string name="cpu_backend_dynarmic">Dynarmic (느림)</string>
|
||||
<string name="cpu_backend_dynarmic">Dynarmic (JIT)</string>
|
||||
<string name="cpu_backend_nce">네이티브 코드 실행 (NCE)</string>
|
||||
|
||||
<!-- CPU Accuracy -->
|
||||
<string name="cpu_accuracy_accurate">정확함</string>
|
||||
<string name="cpu_accuracy_unsafe">최적화 (안전하지 않음)</string>
|
||||
<string name="cpu_accuracy_paranoid">최적화하지 않음 (느림)</string>
|
||||
<string name="cpu_accuracy_paranoid">최적화하지 않음</string>
|
||||
|
||||
<!-- Gamepad Buttons -->
|
||||
<string name="gamepad_d_pad">십자키</string>
|
||||
|
|
|
@ -968,13 +968,13 @@ uma tentativa de mapeamento automático</string>
|
|||
<string name="ratio_stretch">Esticar à janela</string>
|
||||
|
||||
<!-- CPU Backend -->
|
||||
<string name="cpu_backend_dynarmic">Dynarmic (Lenta)</string>
|
||||
<string name="cpu_backend_dynarmic">Dynarmic (JIT)</string>
|
||||
<string name="cpu_backend_nce">Execução de código nativo (NCE)</string>
|
||||
|
||||
<!-- CPU Accuracy -->
|
||||
<string name="cpu_accuracy_accurate">Precisa</string>
|
||||
<string name="cpu_accuracy_unsafe">Não segura</string>
|
||||
<string name="cpu_accuracy_paranoid">Paranoica (Lenta)</string>
|
||||
<string name="cpu_accuracy_paranoid">Paranoica</string>
|
||||
|
||||
<!-- Gamepad Buttons -->
|
||||
<string name="gamepad_d_pad">Botões Direcionais</string>
|
||||
|
|
|
@ -968,13 +968,13 @@ uma tentativa de mapeamento automático</string>
|
|||
<string name="ratio_stretch">Esticar à janela</string>
|
||||
|
||||
<!-- CPU Backend -->
|
||||
<string name="cpu_backend_dynarmic">Dynarmic (Lento)</string>
|
||||
<string name="cpu_backend_dynarmic">Dynarmic (JIT)</string>
|
||||
<string name="cpu_backend_nce">Native code execution (NCE)</string>
|
||||
|
||||
<!-- CPU Accuracy -->
|
||||
<string name="cpu_accuracy_accurate">Preciso</string>
|
||||
<string name="cpu_accuracy_unsafe">Inseguro</string>
|
||||
<string name="cpu_accuracy_paranoid">Paranoid (Lento)</string>
|
||||
<string name="cpu_accuracy_paranoid">Paranoid</string>
|
||||
|
||||
<!-- Gamepad Buttons -->
|
||||
<string name="gamepad_d_pad">Botões Direcionais</string>
|
||||
|
|
|
@ -969,13 +969,13 @@
|
|||
<string name="ratio_stretch">Растянуть до окна</string>
|
||||
|
||||
<!-- CPU Backend -->
|
||||
<string name="cpu_backend_dynarmic">Dynarmic (Медленно)</string>
|
||||
<string name="cpu_backend_dynarmic">Dynarmic (JIT)</string>
|
||||
<string name="cpu_backend_nce">Нативное выполнение (NCE)</string>
|
||||
|
||||
<!-- CPU Accuracy -->
|
||||
<string name="cpu_accuracy_accurate">Точно</string>
|
||||
<string name="cpu_accuracy_unsafe">Небезопасно</string>
|
||||
<string name="cpu_accuracy_paranoid">Параноик (медленно)</string>
|
||||
<string name="cpu_accuracy_paranoid">Параноик</string>
|
||||
|
||||
<!-- Gamepad Buttons -->
|
||||
<string name="gamepad_d_pad">Крестовина</string>
|
||||
|
|
|
@ -988,13 +988,13 @@
|
|||
<string name="ratio_stretch">Протезање до прозора</string>
|
||||
|
||||
<!-- CPU Backend -->
|
||||
<string name="cpu_backend_dynarmic">Динамина (споро)</string>
|
||||
<string name="cpu_backend_dynarmic">Dynarmic (JIT)</string>
|
||||
<string name="cpu_backend_nce">Извођење изворног кода (НЦЕ)</string>
|
||||
|
||||
<!-- CPU Accuracy -->
|
||||
<string name="cpu_accuracy_accurate">Тачан</string>
|
||||
<string name="cpu_accuracy_unsafe">Несигуран</string>
|
||||
<string name="cpu_accuracy_paranoid">Параноичан (споро)</string>
|
||||
<string name="cpu_accuracy_paranoid">Параноичан</string>
|
||||
|
||||
<!-- Gamepad Buttons -->
|
||||
<string name="gamepad_d_pad">Д-пад</string>
|
||||
|
|
|
@ -961,13 +961,13 @@
|
|||
<string name="ratio_stretch">拉伸窗口</string>
|
||||
|
||||
<!-- CPU Backend -->
|
||||
<string name="cpu_backend_dynarmic">动态编译 (慢速)</string>
|
||||
<string name="cpu_backend_dynarmic">Dynarmic (JIT)</string>
|
||||
<string name="cpu_backend_nce">本机代码执行 (NCE)</string>
|
||||
|
||||
<!-- CPU Accuracy -->
|
||||
<string name="cpu_accuracy_accurate">高精度</string>
|
||||
<string name="cpu_accuracy_unsafe">低精度</string>
|
||||
<string name="cpu_accuracy_paranoid">偏执模式 (慢速)</string>
|
||||
<string name="cpu_accuracy_paranoid">偏执模式</string>
|
||||
|
||||
<!-- Gamepad Buttons -->
|
||||
<string name="gamepad_d_pad">十字方向键</string>
|
||||
|
|
|
@ -966,13 +966,13 @@
|
|||
<string name="ratio_stretch">延展視窗</string>
|
||||
|
||||
<!-- CPU Backend -->
|
||||
<string name="cpu_backend_dynarmic">動態 (慢)</string>
|
||||
<string name="cpu_backend_dynarmic">Dynarmic (JIT)</string>
|
||||
<string name="cpu_backend_nce">機器碼執行 (NCE)</string>
|
||||
|
||||
<!-- CPU Accuracy -->
|
||||
<string name="cpu_accuracy_accurate">高精度</string>
|
||||
<string name="cpu_accuracy_unsafe">低精度</string>
|
||||
<string name="cpu_accuracy_paranoid">不合理 (慢)</string>
|
||||
<string name="cpu_accuracy_paranoid">不合理</string>
|
||||
|
||||
<!-- Gamepad Buttons -->
|
||||
<string name="gamepad_d_pad">方向鍵</string>
|
||||
|
|
|
@ -1014,13 +1014,13 @@
|
|||
<string name="ratio_stretch">Stretch to window</string>
|
||||
|
||||
<!-- CPU Backend -->
|
||||
<string name="cpu_backend_dynarmic">Dynarmic (Slow)</string>
|
||||
<string name="cpu_backend_dynarmic">Dynarmic (JIT)</string>
|
||||
<string name="cpu_backend_nce">Native code execution (NCE)</string>
|
||||
|
||||
<!-- CPU Accuracy -->
|
||||
<string name="cpu_accuracy_accurate">Accurate</string>
|
||||
<string name="cpu_accuracy_unsafe">Unsafe</string>
|
||||
<string name="cpu_accuracy_paranoid">Paranoid (Slow)</string>
|
||||
<string name="cpu_accuracy_paranoid">Paranoid</string>
|
||||
|
||||
<!-- Gamepad Buttons -->
|
||||
<string name="gamepad_d_pad">D-pad</string>
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
// SPDX-FileCopyrightText: 2017 Citra Emulator Project
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
|
@ -41,7 +44,14 @@ PerfStats::~PerfStats() {
|
|||
|
||||
const auto path = Common::FS::GetEdenPath(Common::FS::EdenPath::LogDir);
|
||||
// %F Date format expanded is "%Y-%m-%d"
|
||||
const auto filename = fmt::format("{:%F-%H-%M}_{:016X}.csv", *std::localtime(&t), title_id);
|
||||
const auto filename = fmt::format("{}_{:016X}.csv",
|
||||
[&] {
|
||||
std::ostringstream oss;
|
||||
oss << std::put_time(std::localtime(&t), "%F-%H-%M");
|
||||
return oss.str();
|
||||
}(),
|
||||
title_id);
|
||||
|
||||
const auto filepath = path / filename;
|
||||
|
||||
if (Common::FS::CreateParentDir(filepath)) {
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
|
@ -33,7 +36,9 @@ std::filesystem::path GetPath(std::string_view type, u64 title_id, std::string_v
|
|||
|
||||
std::string GetTimestamp() {
|
||||
const auto time = std::time(nullptr);
|
||||
return fmt::format("{:%FT%H-%M-%S}", *std::localtime(&time));
|
||||
std::ostringstream oss;
|
||||
oss << std::put_time(std::localtime(&time), "%FT%H-%M-%S");
|
||||
return oss.str();
|
||||
}
|
||||
|
||||
using namespace nlohmann;
|
||||
|
|
|
@ -246,10 +246,7 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QObject* parent)
|
|||
INSERT(Settings,
|
||||
vram_usage_mode,
|
||||
tr("VRAM Usage Mode:"),
|
||||
tr("Selects whether the emulator should prefer to conserve memory or make maximum usage "
|
||||
"of available video memory for performance.\nHas no effect on integrated graphics. "
|
||||
"Aggressive mode may severely impact the performance of other applications such as "
|
||||
"recording software."));
|
||||
tr("Selects whether the emulator should prefer to conserve memory or make maximum usage of available video memory for performance.\nAggressive mode may severely impact the performance of other applications such as recording software."));
|
||||
INSERT(Settings,
|
||||
skip_cpu_inner_invalidation,
|
||||
tr("Skip CPU Inner Invalidation"),
|
||||
|
|
|
@ -1395,23 +1395,20 @@ void Device::CollectPhysicalMemoryInfo() {
|
|||
}
|
||||
device_access_memory += mem_properties.memoryHeaps[element].size;
|
||||
}
|
||||
if (!is_integrated) {
|
||||
if (is_integrated) {
|
||||
const s64 available_memory = static_cast<s64>(device_access_memory - device_initial_usage);
|
||||
const u64 memory_size = Settings::values.vram_usage_mode.GetValue() == Settings::VramUsageMode::Aggressive ? 6_GiB : 4_GiB;
|
||||
device_access_memory = static_cast<u64>(std::max<s64>(std::min<s64>(available_memory - 8_GiB, memory_size), std::min<s64>(local_memory, memory_size)));
|
||||
} else {
|
||||
const u64 reserve_memory = std::min<u64>(device_access_memory / 8, 1_GiB);
|
||||
device_access_memory -= reserve_memory;
|
||||
|
||||
if (Settings::values.vram_usage_mode.GetValue() != Settings::VramUsageMode::Aggressive) {
|
||||
// Account for resolution scaling in memory limits
|
||||
const size_t normal_memory = 6_GiB;
|
||||
const size_t scaler_memory = 1_GiB * Settings::values.resolution_info.ScaleUp(1);
|
||||
device_access_memory =
|
||||
std::min<u64>(device_access_memory, normal_memory + scaler_memory);
|
||||
device_access_memory = std::min<u64>(device_access_memory, normal_memory + scaler_memory);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
const s64 available_memory = static_cast<s64>(device_access_memory - device_initial_usage);
|
||||
device_access_memory = static_cast<u64>(std::max<s64>(
|
||||
std::min<s64>(available_memory - 8_GiB, 6_GiB), std::min<s64>(local_memory, 6_GiB)));
|
||||
}
|
||||
|
||||
void Device::CollectToolingInfo() {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue