mirror of
https://git.eden-emu.dev/eden-emu/eden.git
synced 2026-10-01 04:24:21 +00:00
Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b08b437339 | |||
| ad67c5d57d | |||
| f8b7651104 | |||
| 3f78512c83 | |||
| a82f31a310 |
Vendored
+455
-473
File diff suppressed because it is too large
Load Diff
Vendored
+439
-456
File diff suppressed because it is too large
Load Diff
Vendored
+439
-456
File diff suppressed because it is too large
Load Diff
Vendored
+439
-456
File diff suppressed because it is too large
Load Diff
Vendored
+440
-463
File diff suppressed because it is too large
Load Diff
Vendored
+439
-456
File diff suppressed because it is too large
Load Diff
Vendored
+439
-456
File diff suppressed because it is too large
Load Diff
Vendored
+439
-456
File diff suppressed because it is too large
Load Diff
Vendored
+439
-456
File diff suppressed because it is too large
Load Diff
Vendored
+439
-456
File diff suppressed because it is too large
Load Diff
Vendored
+439
-456
File diff suppressed because it is too large
Load Diff
Vendored
+439
-456
File diff suppressed because it is too large
Load Diff
Vendored
+439
-456
File diff suppressed because it is too large
Load Diff
Vendored
+440
-463
File diff suppressed because it is too large
Load Diff
Vendored
+439
-456
File diff suppressed because it is too large
Load Diff
Vendored
+439
-456
File diff suppressed because it is too large
Load Diff
Vendored
+439
-456
File diff suppressed because it is too large
Load Diff
Vendored
+439
-456
File diff suppressed because it is too large
Load Diff
Vendored
+439
-456
File diff suppressed because it is too large
Load Diff
Vendored
+440
-463
File diff suppressed because it is too large
Load Diff
Vendored
+440
-463
File diff suppressed because it is too large
Load Diff
Vendored
+439
-456
File diff suppressed because it is too large
Load Diff
Vendored
+439
-456
File diff suppressed because it is too large
Load Diff
Vendored
+439
-456
File diff suppressed because it is too large
Load Diff
Vendored
+439
-456
File diff suppressed because it is too large
Load Diff
Vendored
+440
-463
File diff suppressed because it is too large
Load Diff
Vendored
+439
-456
File diff suppressed because it is too large
Load Diff
@@ -150,7 +150,7 @@ ENUM(ScalingFilter, NearestNeighbor, Bilinear, Bicubic, Gaussian, Lanczos, Scale
|
|||||||
ENUM(AntiAliasing, None, Fxaa, Smaa);
|
ENUM(AntiAliasing, None, Fxaa, Smaa);
|
||||||
ENUM(AspectRatio, R16_9, R4_3, R21_9, R16_10, Stretch);
|
ENUM(AspectRatio, R16_9, R4_3, R21_9, R16_10, Stretch);
|
||||||
ENUM(ConsoleMode, Handheld, Docked);
|
ENUM(ConsoleMode, Handheld, Docked);
|
||||||
ENUM(AppletMode, HLE, LLE);
|
ENUM(AppletMode, HLE, LLE, Disabled);
|
||||||
ENUM(SpirvOptimizeMode, Never, OnLoad, Always);
|
ENUM(SpirvOptimizeMode, Never, OnLoad, Always);
|
||||||
ENUM(GpuClock, Normal, Boost, Overclock)
|
ENUM(GpuClock, Normal, Boost, Overclock)
|
||||||
ENUM(GpuUnswizzleSize, VerySmall, Small, Normal, Large, VeryLarge)
|
ENUM(GpuUnswizzleSize, VerySmall, Small, Normal, Large, VeryLarge)
|
||||||
|
|||||||
@@ -250,9 +250,10 @@ std::shared_ptr<FrontendApplet> FrontendAppletHolder::GetApplet(std::shared_ptr<
|
|||||||
return std::make_shared<PhotoViewer>(system, applet, mode, *frontend.photo_viewer);
|
return std::make_shared<PhotoViewer>(system, applet, mode, *frontend.photo_viewer);
|
||||||
case AppletId::NetConnect:
|
case AppletId::NetConnect:
|
||||||
return std::make_shared<NetConnect>(system, applet, mode, *frontend.net_connect);
|
return std::make_shared<NetConnect>(system, applet, mode, *frontend.net_connect);
|
||||||
|
case AppletId::None:
|
||||||
|
return nullptr;
|
||||||
default:
|
default:
|
||||||
LOG_ERROR(Service_AM, "No backend implementation exists for applet_id={:02X} program_id={:016X}"
|
UNIMPLEMENTED_MSG("No frontend implementation exists for applet_id={:02X} program_id={:016X}! Using stub applet.", static_cast<u8>(id), applet->program_id);
|
||||||
"Falling back to stub applet", static_cast<u8>(id), applet->program_id);
|
|
||||||
return std::make_shared<StubApplet>(system, applet, id, mode);
|
return std::make_shared<StubApplet>(system, applet, id, mode);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,6 +16,10 @@
|
|||||||
#include "core/hle/service/ro/ro_types.h"
|
#include "core/hle/service/ro/ro_types.h"
|
||||||
#include "core/hle/service/server_manager.h"
|
#include "core/hle/service/server_manager.h"
|
||||||
#include "core/hle/service/service.h"
|
#include "core/hle/service/service.h"
|
||||||
|
#ifdef HAS_NCE
|
||||||
|
#include "core/arm/nce/patcher.h"
|
||||||
|
#include "core/hle/kernel/k_shared_memory.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace Service::RO {
|
namespace Service::RO {
|
||||||
|
|
||||||
@@ -386,7 +390,7 @@ public:
|
|||||||
R_SUCCEED();
|
R_SUCCEED();
|
||||||
}
|
}
|
||||||
|
|
||||||
Result MapManualLoadModuleMemory(u64* out_address, size_t context_id, u64 nro_address,
|
Result MapManualLoadModuleMemory(Kernel::KernelCore& kernel, u64* out_address, size_t context_id, u64 nro_address,
|
||||||
u64 nro_size, u64 bss_address, u64 bss_size) {
|
u64 nro_size, u64 bss_address, u64 bss_size) {
|
||||||
// Get context.
|
// Get context.
|
||||||
ProcessContext* context = this->GetContextById(context_id);
|
ProcessContext* context = this->GetContextById(context_id);
|
||||||
@@ -421,7 +425,31 @@ public:
|
|||||||
R_TRY(context->ValidateNro(std::addressof(nro_info->module_id), std::addressof(rx_size),
|
R_TRY(context->ValidateNro(std::addressof(nro_info->module_id), std::addressof(rx_size),
|
||||||
std::addressof(ro_size), std::addressof(rw_size),
|
std::addressof(ro_size), std::addressof(rw_size),
|
||||||
nro_info->base_address, nro_size, bss_size));
|
nro_info->base_address, nro_size, bss_size));
|
||||||
|
#ifdef HAS_NCE
|
||||||
|
if (Settings::IsNceEnabled()) {
|
||||||
|
auto* process = context->GetProcess();
|
||||||
|
auto& memory = process->GetMemory();
|
||||||
|
|
||||||
|
std::vector<u8> image(total_size);
|
||||||
|
memory.ReadBlock(nro_info->base_address, image.data(), rx_size);
|
||||||
|
|
||||||
|
Kernel::CodeSet::Segment code{.size = static_cast<u32>(rx_size)};
|
||||||
|
Core::NCE::Patcher patch;
|
||||||
|
patch.PatchText(image, code);
|
||||||
|
patch.RelocateAndCopy(nro_info->base_address, code, image, nullptr);
|
||||||
|
|
||||||
|
const u64 patch_address = nro_info->base_address + total_size;
|
||||||
|
const size_t patch_size = patch.GetSectionSize();
|
||||||
|
constexpr auto permission = Kernel::Svc::MemoryPermission::ReadExecute;
|
||||||
|
|
||||||
|
auto* patch_memory = Kernel::KSharedMemory::Create(kernel);
|
||||||
|
R_TRY(patch_memory->Initialize(kernel, kernel.System().DeviceMemory(), process, permission, permission, patch_size));
|
||||||
|
std::memcpy(patch_memory->GetPointer(), image.data() + total_size, patch_size);
|
||||||
|
R_TRY(process->AddSharedMemory(kernel, patch_memory, patch_address, patch_size));
|
||||||
|
R_TRY(patch_memory->Map(*process, patch_address, patch_size, permission));
|
||||||
|
memory.WriteBlock(nro_info->base_address, image.data(), rx_size);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
// Set NRO perms.
|
// Set NRO perms.
|
||||||
R_TRY(SetNroPerms(context->GetProcess(), nro_info->base_address, rx_size, ro_size,
|
R_TRY(SetNroPerms(context->GetProcess(), nro_info->base_address, rx_size, ro_size,
|
||||||
rw_size + bss_size));
|
rw_size + bss_size));
|
||||||
@@ -531,7 +559,7 @@ public:
|
|||||||
Result MapManualLoadModuleMemory(Out<u64> out_load_address, ClientProcessId client_pid,
|
Result MapManualLoadModuleMemory(Out<u64> out_load_address, ClientProcessId client_pid,
|
||||||
u64 nro_address, u64 nro_size, u64 bss_address, u64 bss_size) {
|
u64 nro_address, u64 nro_size, u64 bss_address, u64 bss_size) {
|
||||||
R_TRY(m_ro->ValidateProcess(m_context_id, *client_pid));
|
R_TRY(m_ro->ValidateProcess(m_context_id, *client_pid));
|
||||||
R_RETURN(m_ro->MapManualLoadModuleMemory(out_load_address.Get(), m_context_id, nro_address,
|
R_RETURN(m_ro->MapManualLoadModuleMemory(system.Kernel(), out_load_address.Get(), m_context_id, nro_address,
|
||||||
nro_size, bss_address, bss_size));
|
nro_size, bss_address, bss_size));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -342,9 +342,6 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QObject* parent) {
|
|||||||
"it bypasses such prompts and directly exits the emulation."));
|
"it bypasses such prompts and directly exits the emulation."));
|
||||||
INSERT(UISettings, hide_mouse, tr("Hide mouse on inactivity"),
|
INSERT(UISettings, hide_mouse, tr("Hide mouse on inactivity"),
|
||||||
tr("Hides the mouse after 2.5s of inactivity."));
|
tr("Hides the mouse after 2.5s of inactivity."));
|
||||||
INSERT(UISettings, controller_applet_disabled, tr("Disable controller applet"),
|
|
||||||
tr("Forcibly disables the use of the controller applet in emulated programs.\n"
|
|
||||||
"When a program attempts to open the controller applet, it is immediately closed."));
|
|
||||||
INSERT(UISettings, check_for_updates, tr("Check for updates"),
|
INSERT(UISettings, check_for_updates, tr("Check for updates"),
|
||||||
tr("Whether or not to check for updates upon startup."));
|
tr("Whether or not to check for updates upon startup."));
|
||||||
|
|
||||||
@@ -380,6 +377,7 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QObject* parent) {
|
|||||||
{
|
{
|
||||||
PAIR(AppletMode, HLE, tr("Custom frontend")),
|
PAIR(AppletMode, HLE, tr("Custom frontend")),
|
||||||
PAIR(AppletMode, LLE, tr("Real applet")),
|
PAIR(AppletMode, LLE, tr("Real applet")),
|
||||||
|
PAIR(AppletMode, Disabled, tr("Disabled")),
|
||||||
}});
|
}});
|
||||||
|
|
||||||
translations->insert({Settings::EnumMetadata<Settings::SpirvOptimizeMode>::Index(),
|
translations->insert({Settings::EnumMetadata<Settings::SpirvOptimizeMode>::Index(),
|
||||||
|
|||||||
@@ -127,8 +127,6 @@ struct Values {
|
|||||||
Setting<bool> hide_mouse{
|
Setting<bool> hide_mouse{
|
||||||
linkage, true, "hideInactiveMouse", Category::UiGeneral, Settings::Specialization::Default,
|
linkage, true, "hideInactiveMouse", Category::UiGeneral, Settings::Specialization::Default,
|
||||||
true, true};
|
true, true};
|
||||||
Setting<bool> controller_applet_disabled{linkage, false, "disableControllerApplet",
|
|
||||||
Category::UiGeneral};
|
|
||||||
// Set when Vulkan is known to crash the application
|
// Set when Vulkan is known to crash the application
|
||||||
bool has_broken_vulkan = false;
|
bool has_broken_vulkan = false;
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,6 @@
|
|||||||
|
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
|
||||||
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
// SPDX-FileCopyrightText: 2024 yuzu Emulator Project
|
// SPDX-FileCopyrightText: 2024 yuzu Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
@@ -8,7 +11,6 @@
|
|||||||
|
|
||||||
class QCheckBox;
|
class QCheckBox;
|
||||||
class QLineEdit;
|
class QLineEdit;
|
||||||
class QComboBox;
|
|
||||||
class QDateTimeEdit;
|
class QDateTimeEdit;
|
||||||
namespace Core {
|
namespace Core {
|
||||||
class System;
|
class System;
|
||||||
|
|||||||
@@ -140,7 +140,12 @@ QWidget* Widget::CreateCombobox(std::function<std::string()>& serializer,
|
|||||||
if (combobox_enumerations.contains(type)) {
|
if (combobox_enumerations.contains(type)) {
|
||||||
enumeration = &combobox_enumerations.at(type);
|
enumeration = &combobox_enumerations.at(type);
|
||||||
for (const auto& [id, name] : *enumeration) {
|
for (const auto& [id, name] : *enumeration) {
|
||||||
combobox->addItem(name);
|
if (type == Settings::EnumMetadata<Settings::AppletMode>::Index() &&
|
||||||
|
id == static_cast<u32>(Settings::AppletMode::Disabled) &&
|
||||||
|
setting.Id() != Settings::values.controller_applet_mode.Id()) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
combobox->addItem(name, id);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
return combobox;
|
return combobox;
|
||||||
@@ -158,9 +163,8 @@ QWidget* Widget::CreateCombobox(std::function<std::string()>& serializer,
|
|||||||
const u32 setting_value = std::strtoul(setting.ToString().c_str(), nullptr, 0);
|
const u32 setting_value = std::strtoul(setting.ToString().c_str(), nullptr, 0);
|
||||||
combobox->setCurrentIndex(find_index(setting_value));
|
combobox->setCurrentIndex(find_index(setting_value));
|
||||||
|
|
||||||
serializer = [this, enumeration]() {
|
serializer = [this]() {
|
||||||
int current = combobox->currentIndex();
|
return std::to_string(combobox->currentData().toUInt());
|
||||||
return std::to_string(enumeration->at(current).first);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
restore_func = [this, find_index]() {
|
restore_func = [this, find_index]() {
|
||||||
|
|||||||
@@ -1786,7 +1786,7 @@ bool MainWindow::LoadROM(const QString& filename, Service::AM::FrontendAppletPar
|
|||||||
|
|
||||||
QtCommon::system->SetFrontendAppletSet({
|
QtCommon::system->SetFrontendAppletSet({
|
||||||
std::make_unique<QtAmiiboSettings>(*this), // Amiibo Settings
|
std::make_unique<QtAmiiboSettings>(*this), // Amiibo Settings
|
||||||
(UISettings::values.controller_applet_disabled.GetValue() == true)
|
(Settings::values.controller_applet_mode.GetValue() == Settings::AppletMode::Disabled)
|
||||||
? nullptr
|
? nullptr
|
||||||
: std::make_unique<QtControllerSelector>(*this), // Controller Selector
|
: std::make_unique<QtControllerSelector>(*this), // Controller Selector
|
||||||
std::make_unique<QtErrorDisplay>(*this), // Error Display
|
std::make_unique<QtErrorDisplay>(*this), // Error Display
|
||||||
|
|||||||
Reference in New Issue
Block a user