VERY experimental Nintendo Switch 2 emulator
C++
[am] Improve some error messages (#2996)
MaranBr7764cdd57ec8
diff --git a/src/core/hle/service/am/frontend/applet_web_browser.cpp b/src/core/hle/service/am/frontend/applet_web_browser.cppindex 9786f5a99a..8246b3e88e 100644--- a/src/core/hle/service/am/frontend/applet_web_browser.cpp+++ b/src/core/hle/service/am/frontend/applet_web_browser.cpp@@ -237,7 +237,6 @@ WebBrowser::~WebBrowser() = default;void WebBrowser::Initialize() {if (Settings::values.disable_web_applet) {- LOG_INFO(Service_AM, "Web Browser Applet disabled, skipping.");return;}@@ -305,6 +304,7 @@ void WebBrowser::ExecuteInteractive() {void WebBrowser::Execute() {if (Settings::values.disable_web_applet) {+ LOG_WARNING(Service_AM, "(STUBBED) called, Web Browser Applet is disabled");WebBrowserExit(WebExitReason::EndButtonPressed);return;}diff --git a/src/core/hle/service/am/frontend/applets.cpp b/src/core/hle/service/am/frontend/applets.cppindex bb69869ade..a25b7e3aa2 100644--- a/src/core/hle/service/am/frontend/applets.cpp+++ b/src/core/hle/service/am/frontend/applets.cpp@@ -229,8 +229,7 @@ std::shared_ptr<FrontendApplet> FrontendAppletHolder::GetApplet(std::shared_ptr<case AppletId::ProfileSelect:return std::make_shared<ProfileSelect>(system, applet, mode, *frontend.profile_select);case AppletId::SoftwareKeyboard:- return std::make_shared<SoftwareKeyboard>(system, applet, mode,- *frontend.software_keyboard);+ return std::make_shared<SoftwareKeyboard>(system, applet, mode, *frontend.software_keyboard);case AppletId::MiiEdit:return std::make_shared<MiiEdit>(system, applet, mode, *frontend.mii_edit);case AppletId::Web:@@ -244,9 +243,7 @@ std::shared_ptr<FrontendApplet> FrontendAppletHolder::GetApplet(std::shared_ptr<case AppletId::NetConnect:return std::make_shared<NetConnect>(system, applet, mode, *frontend.net_connect);default:- UNIMPLEMENTED_MSG(- "No backend implementation exists for applet_id={:02X}! Falling back to stub applet.",- static_cast<u8>(id));+ LOG_ERROR(Service_AM, "No backend implementation exists for applet_id={:02X}. Falling back to stub applet", static_cast<u8>(id));return std::make_shared<StubApplet>(system, applet, id, mode);}}diff --git a/src/video_core/shader_environment.cpp b/src/video_core/shader_environment.cppindex db340efdae..de12d795c8 100644--- a/src/video_core/shader_environment.cpp+++ b/src/video_core/shader_environment.cpp@@ -59,7 +59,7 @@ static Shader::TextureType ConvertTextureType(const Tegra::Texture::TICEntry& encase Tegra::Texture::TextureType::TextureCubeArray:return Shader::TextureType::ColorArrayCube;default:- LOG_ERROR(Shader, "Invalid texture_type={}, falling back to texture_type={}", static_cast<int>(entry.texture_type.Value()), Shader::TextureType::Color2D);+ LOG_ERROR(Shader, "Invalid texture_type={}. Falling back to texture_type={}", static_cast<int>(entry.texture_type.Value()), Shader::TextureType::Color2D);return Shader::TextureType::Color2D;}}diff --git a/src/yuzu/configuration/configure_debug.cpp b/src/yuzu/configuration/configure_debug.cppindex 70fd90734f..db8956474c 100644--- a/src/yuzu/configuration/configure_debug.cpp+++ b/src/yuzu/configuration/configure_debug.cpp@@ -75,9 +75,10 @@ void ConfigureDebug::SetConfiguration() {ui->disable_loop_safety_checks->setChecked(Settings::values.disable_shader_loop_safety_checks.GetValue());ui->extended_logging->setChecked(Settings::values.extended_logging.GetValue());ui->perform_vulkan_check->setChecked(Settings::values.perform_vulkan_check.GetValue());+#ifdef YUZU_USE_QT_WEB_ENGINEui->disable_web_applet->setChecked(Settings::values.disable_web_applet.GetValue());--#ifndef YUZU_USE_QT_WEB_ENGINE+#else+ ui->disable_web_applet->setChecked(true);ui->disable_web_applet->setVisible(false);#endif}